| d6cd04adb85895b340ce9b6df33b749b22099c43 |
|
14-Sep-2011 |
Joe Moore and Tyler Schultz <tylerschultz@gmail.com> |
Merge pull request #141 from developernotes/upstream
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| bb2f85d397fa65f20c6932186d9156ced9beb184 |
|
01-Sep-2011 |
Michael Portuesi <mikep@zoodles.com> |
Test cases for i18n-strict, plus bugfixes
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| 718a56a01f49a2d4f17d5659d4291aa1d6991682 |
|
31-Aug-2011 |
Michael Portuesi <mikep@zoodles.com> |
Support for i18n checking for resource files (views, menus, preferences)
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| 49b51ef87a395b9fa7ab6167df0969425cea014d |
|
12-Aug-2011 |
Jesse Toth & Tim Labeeuw <pair+jesse+tim@pivotallabs.com> |
Views properly namespaced with android:X/Y
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| 2cdde11355e7c249e83a8b7aaabae5977bbc3e49 |
|
03-Feb-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Repackaging
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| ba7a1270d36fb28e5f90be135431700c4ce81504 |
|
28-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
fixed menu loading
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| 29610b43047065c5dc66452d33f0113ac7e65fe8 |
|
21-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Trying palfrey's changes again
Revert "Revert "Making a distinction between system resources, loaded from the Android SDK, and local resources. Code that accesses resources now explicitly accesses local resources except in the specific new cases where system resources need to be accessed.""
This reverts commit d86e484c4a8692c1a726cc05f0da1b310ab3a940.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| d86e484c4a8692c1a726cc05f0da1b310ab3a940 |
|
21-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Revert "Making a distinction between system resources, loaded from the Android SDK, and local resources. Code that accesses resources now explicitly accesses local resources except in the specific new cases where system resources need to be accessed."
This reverts commit f540e3687a4ca75ea6b40f577b7807cca30119be, reversing
changes made to 6a85565da2f3ce4187865d9cee2da58e992a4650.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| f540e3687a4ca75ea6b40f577b7807cca30119be |
|
19-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Making a distinction between system resources, loaded from the Android SDK, and local resources. Code that accesses resources now explicitly accesses local resources except in the specific new cases where system resources need to be accessed.
String resources are stored in separate locations so that name collisions can be tolerated. Value collisions, however, are not tolerated: two different strings can have the same name (and so must be explicitly resolved as either local or system resources) but they may never have the same id.
Merge branch 'palfrey-SpinnerTest'
Conflicts:
src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowArrayAdapter.java
src/test/java/com/xtremelabs/robolectric/shadows/AbsSpinnerTest.java
|
| 40c6251719cccc0a84ae99c976d2836b14374ce6 |
|
14-Jan-2011 |
Christian Williams <antixian666@gmail.com> |
Auto reformat; optimize imports; minor JavaDoc fixes.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/MenuLoader.java
|
| b539366073ccb47433de7191dbbf519ed4ab2d8f |
|
27-Dec-2010 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Merge branch 'MenuInflater' of https://github.com/palfrey/robolectric into palfrey-MenuInflater
Conflicts:
src/com/xtremelabs/robolectric/Robolectric.java
src/com/xtremelabs/robolectric/res/ResourceLoader.java
|