| ec6d8283fd081a060e9ed8a6defeee8b83302a97 |
|
12-Mar-2012 |
Michael Portuesi <mikep@zoodles.com> |
Avoid a crash when @null is used as a resource ID in XML layouts. Returns 0 as resource ID for @null.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.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/ResourceExtractor.java
|
| 3cbf22ab49f98f63e4286eb2b75ec55fc4dade72 |
|
11-Aug-2011 |
Jesse Toth & Tim Labeeuw <pair+jesse+tim@pivotallabs.com> |
Fixed TestAttributeSet to work with android namespace. Also fixed bug in ResourceExtractorTest
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|
| 28dc94ecb7ac94834b97e3f6be778b3f2bb734fd |
|
11-Aug-2011 |
Jesse Toth & Tim Labeeuw <pair+jesse+tim@pivotallabs.com> |
String and color resources properly namespaced with android:X/Y
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|
| d64bf34de2b01d88c33b05caa746b7163c16d098 |
|
06-Jul-2011 |
Ryan Richard <pair+rrichard@pivotallabs.com> |
- fix bug in ResourceExtractor
- add test to show that TextView's have textColor after layout inflation
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|
| 72ee6c0e205c424f0706051d89e1c7f184bf8269 |
|
26-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
formatting
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|
| 6dcdc015203d141785372b318cc4af073e6e679f |
|
26-Jan-2011 |
Ronald Dehuysser <ronald.dehuysser@gmail.com> |
Merge commit 'upstream/master'
Conflicts:
src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
src/test/java/com/xtremelabs/robolectric/R.java
src/test/java/com/xtremelabs/robolectric/res/TestAttributeSetTest.java
Signed-off-by: Ronald Dehuysser <ronald.dehuysser@gmail.com>
|
| 10433f9de1c469f25bb0328b9c058e4c92489e6b |
|
24-Jan-2011 |
Christian Williams <xian@squareup.com> |
Styleables aren't in the same numberspace as other ints in the R file.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.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/ResourceExtractor.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/ResourceExtractor.java
|
| 4baf90fcda4a6d4c5cad3e8f857be1f4a070074e |
|
20-Jan-2011 |
Ronald Dehuysser <ronald.dehuysser@gmail.com> |
Fix for resources in android namespace: when setting an dropDownViewResource on a spinnerAdapter, a reference to @android:id/text1 is used... but this is not found because the TestAttributeSet looks for it via getLocalResourceId. I added a new method called getResourceId that checks if the resourceName starts with the android namespace. If so, we should look for a systemResource. Also added test for this.
Signed-off-by: Ronald Dehuysser <ronald.dehuysser@gmail.com>
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.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
|
| d9bbe818dd593604ecd295fd6f9302d302d35c28 |
|
09-Jan-2011 |
Tom Parker <palfrey@tevp.net> |
ResourceExtractor shouldn't throw errors
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|
| 26cd9a228c4c68c012cfaa7bedc63031d67f3a11 |
|
09-Jan-2011 |
Tom Parker <palfrey@tevp.net> |
Add namespace for internal ids to list of excludes
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|
| f2e24d11eb236dc06769d50b3cd1c5b90dbf1735 |
|
03-Jan-2011 |
Tom Parker <palfrey@tevp.net> |
Throw RuntimeException if getResourceName() fails
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|
| 4ac725f9b4cebbf46805fc5e9b2f0eaf3fdd9b29 |
|
22-Dec-2010 |
Christian Williams <pair+xian@pivotallabs.com> |
Rearrange source tree to follow maven conventions.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceExtractor.java
|