| 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
|
| 9d14e4b4b8e308dba6455a7e2c780c32cff6d273 |
|
24-May-2011 |
Michael Portuesi <mikep@zoodles.com> |
Implement ShadowPreference#setDependency, #getDependency
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| db942f0867e5e1f3bc97eb8facf686bdbca7c20a |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added ShadowListPreference and cleaned up ShadowPreference a little.
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 8a9faa25fa0a1bdc4f7acc09ac968da63540997c |
|
23-Mar-2011 |
adriancowham <adrian@zoodles.com> |
added some more preference tests
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 13c284c27d1e302a3564a8b4259922b64ca7678d |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added click() method to ShadowPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 5773573687f3d05e5e97816b1c5d31e6a4d7f212 |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added click listener support to ShadowPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 5ee82201f6e34eee062a12e1b1c57123b8cdc2f2 |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added order to ShadowPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 395ccc7732a27c21af50ae8dad634c80a2c0f14c |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added ShadowPreference support for default value
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| d876b7e662a061353260034129afd9605c7b8f40 |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added summary support to ShadowPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| ca3a400d69d3b4c697d78c4013d9d78b46053272 |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Added context-only constructor to ShadowPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 38c6ce36d70bb518e9a2a8e1b496ce4c225e8d44 |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
ShadowPreference now setting key value from attributes
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 65b198f024aea2f29ce34287bbe6027a632d37b1 |
|
22-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
ShadowPreferenceGroup more implemented and tested
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 860f8c39f4b14a23d103310d523c7855d40b8f58 |
|
22-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
Adding ShadowPreferenceScreen.
Fixing wiring test failure.
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| ca8b4e7c96507b66cb816a3383c93b02d79a7685 |
|
07-Mar-2011 |
Tyler Schultz <tylerschultz@gmail.com> |
Merge branch 'master' of https://github.com/zoodles/robolectric into zoodles-master
|
| c1cb9c7b5226198b51f272c6e41d8630f123d023 |
|
11-Feb-2011 |
Rich Humphrey <rich@zoodles.com> |
Added a little more to ShadowPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 8854adc03b66442ceb8edef27ca4f6993f792d23 |
|
11-Feb-2011 |
Michael Portuesi <mikep@zoodles.com> |
More merging with pivotal/robolectric
|
| 97f349c4ea58c18d79083dc9a02353bbe2a56fbf |
|
11-Feb-2011 |
Rich Humphrey <rich@zoodles.com> |
Implemented Preference.shouldPersist() and Preference.getPersistedInt()
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|
| 079a071612e45353e46bde2f29eff7e6fc762f01 |
|
11-Feb-2011 |
Rich Humphrey <rich@zoodles.com> |
Added ShadowPreference and ShadowProgressBar
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceTest.java
|