| d10641d5321f5bf7d94e015fb4b7ef41c8ddd710 |
|
12-Jul-2011 |
Lenny Turetsky & Tim Labeeuw <pair+lenny+tlabeeuw@pivotallabs.com> |
Added CookieSyncManager#reset
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieSyncManager.java
|
| 7598f0c0b1cce3bf1902772ea09139ef98083864 |
|
24-Jun-2011 |
Ryan Richard & Tyler Schultz <pair+rrichard+tyler@pivotallabs.com> |
Merge branch 'master' of https://github.com/zoodles/robolectric into zoodles-master
Conflicts:
src/main/java/com/xtremelabs/robolectric/Robolectric.java
src/main/java/com/xtremelabs/robolectric/RobolectricTestRunner.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowAdapterView.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowCursorAdapter.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowMotionEvent.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowPendingIntent.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowTelephonyManager.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java
src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java
src/test/java/com/xtremelabs/robolectric/shadows/IntentTest.java
src/test/java/com/xtremelabs/robolectric/shadows/TelephonyManagerTest.java
src/test/java/com/xtremelabs/robolectric/shadows/TextViewTest.java
|
| 32fa4fc29ce30047ce5c3c00e3eea5cf1c27b056 |
|
18-May-2011 |
adriancowham <adrian@zoodles.com> |
Added support for CookieSyncManager
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCookieSyncManager.java
|