| 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
|
| a70f4d5a9be9812c9295e05506ea3a9e5a28c36a |
|
23-Mar-2011 |
adriancowham <adrian@zoodles.com> |
added a test for getlistView() for long presses in the Zooldes Preferences
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java
|
| 5ec242e7f4ba642abb5cc3dceee0dc49ce2f1a3f |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
PreferenceLoader wired into ResourceLoader and ShadowPreferenceActivity
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java
|
| 860f8c39f4b14a23d103310d523c7855d40b8f58 |
|
22-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Adding ShadowPreferenceScreen.
Fixing wiring test failure.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java
|
| eb47a8c4f989358eb087720918ff77a8e1e6f260 |
|
22-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added shadows for PreferenceActivity, PreferenceGroup, and PreferenceCategory.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/shadows/ShadowPreferenceActivity.java
|