Cross Reference: /external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceScreenTest.java

History log of /external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/PreferenceScreenTest.java
Revision		Date	Author	Comments (<<< Hide modified files) (Show modified files >>>)
5f52066979dd3a3eb6a0df2cd360611c50fb31ec		01-Jul-2011	Ryan Richard <pair+rrichard@pivotallabs.com>	Merge remote branch 'upstream/master' Conflicts: .pairs src/main/java/com/xtremelabs/robolectric/Robolectric.java src/main/java/com/xtremelabs/robolectric/shadows/ShadowActivity.java src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialog.java src/main/java/com/xtremelabs/robolectric/shadows/ShadowService.java src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabHost.java src/main/java/com/xtremelabs/robolectric/shadows/ShadowTabSpec.java src/main/java/com/xtremelabs/robolectric/shadows/ShadowView.java src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/TestHttpResponse.java src/test/java/com/xtremelabs/robolectric/RobolectricTest.java src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.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/PreferenceScreenTest.java