| bd20b3c07ba0d63c0e62744eef3c90b69cd6b126 |
|
26-Jun-2013 |
Jon Boekenoogen <jboekeno@google.com> |
Fixed build: Fix resource loading in robolectric for API 18+.
Look at resource folders in the SDK starting at 18 and continue
backwards for 5 sdk versions.
Bug: 9573511
Change-Id: If6318dfea851322b5f7798e9df7e96c001f3a1f5
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 3daf5555d7e08c67aa94e002f5d4347bc1ae3eef |
|
27-Jun-2013 |
Jeff Hamilton <jham@google.com> |
Revert "Fix resource loading in robolectric for API 18+."
This reverts commit 03e9d1058a5f759d0e356563d7e8499ff71b5165.
Change-Id: Ib79f9954bea69eaba1b7a9b9c2b908b1622bc348
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 03e9d1058a5f759d0e356563d7e8499ff71b5165 |
|
26-Jun-2013 |
Jon Boekenoogen <jboekeno@google.com> |
Fix resource loading in robolectric for API 18+.
Look at resource folders in the SDK starting at 18 and continue
backwards for 5 sdk versions.
Bug: 9573511
Change-Id: Ib1f92a247e572be41c4a74ba0556988ae306a0ea
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| df5951775e9c13526de56166ccdb841aa910a674 |
|
03-Oct-2012 |
Jon Boekenoogen <jboekeno@google.com> |
Prevent ResourceLoader crash when running Robolectric without a generated R class
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 7fb9367f21d1d50fa798098f24e0c3e9f7497324 |
|
20-Sep-2012 |
Jon Boekenoogen <jboekeno@google.com> |
Fix NPE in ResourceLoader if there is no xmlResourceDir
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| dd40f718cf785a56e63c0685feeb73d266c13e3f |
|
07-Aug-2012 |
Wenhui Yao <wenhui@zoodles.com> |
Add locale support for values directory
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 34bf42d4b3689b33c474e2f6e2f6294c429ce1a6 |
|
06-Jun-2012 |
Maja Bratseth <mbratset@cisco.com> |
Loading int resources from same dir as others
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| bcbafcdb16f0cb5161f9b7356b6dfff178c208b4 |
|
26-Apr-2012 |
Michael Portuesi <mikep@zoodles.com> |
Remove deprecated support for retrieving dimension resources
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| ea277a780371ce94fb402f7853daefc3a8580f0c |
|
20-Apr-2012 |
Michael Portuesi <mikep@zoodles.com> |
Basic implementation of NinePatchDrawable in resource loader
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| aec1d0888fe04efd0cde7514e155870b18c41286 |
|
27-Mar-2012 |
Rick Kawala & Wei Wu <pair+rick+wwu@apptera.com@pivotallabs.com> |
add support for animation drawable
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 48f3d7b9a3f4a9f3b719782cae007edac11ed454 |
|
16-Mar-2012 |
Wenhui Yao <wenhui@zoodles.com> |
Add XTagResourceXmlLoader
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 9472d8faeb0c6fa20529234e7e2a7ebf967d1f32 |
|
10-Mar-2012 |
Michael Portuesi <mikep@zoodles.com> |
Implement Resources#getDimension by reading values from XML files. The old implementation is retained, but deprecated.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 8900025d7fa03579c0ae4d19255d3a8650cbf12a |
|
14-Feb-2012 |
Phil Goodwin & Ryan Richard <pair+phil+rrichard@pivotallabs.com> |
Support same layout file in different res directories for testing. For example, you can use Robolectric.getShadowApplication().getResourceLoader().setLayoutQualifierSearchPath("land", "port") to set the res directory search order for layout files to "layout-land" followed by "layout-port" followed by "layout".
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 4a379927cec523b89d48863569c379fcf0d27796 |
|
19-Jan-2012 |
Jan Berkel <jan.berkel@gmail.com> |
ResourceLoader: also check android.sdk.path property
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| fac8bbf7dfc7904540716be8649b2f5a5c9f6d15 |
|
12-Sep-2011 |
adriancowham <adrian@zoodles.com> |
added support for StateListDrawables without the state
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.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/ResourceLoader.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/ResourceLoader.java
|
| a6d34e0b33533736dd8425a582ed48b40f18ac06 |
|
20-Aug-2011 |
Michael Portuesi <mikep@zoodles.com> |
merge pull request #121 from zoodles
|
| 2ac51eb24bd7d935791ee42aa3406653eb531529 |
|
13-Aug-2011 |
Jesse Toth & Tim Labeeuw <pair+jesse+tim@pivotallabs.com> |
Fix loading system views/layouts in ResourceLoader
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| b8057d57881b5106567cdeff084a1b4a58ba5514 |
|
11-Aug-2011 |
Jesse Toth & Tim Labeeuw <pair+jesse+tim@pivotallabs.com> |
getting rid of annoying formatting
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 7f306c7c98e32f85115ce57780a6752477b8faad |
|
11-Aug-2011 |
adriancowham <adrian@zoodles.com> |
upstream merge
|
| 3cebac0de0691c6f27dbdd441cf78cbf8623eddf |
|
10-Aug-2011 |
adriancowham <adrian@zoodles.com> |
added tests for ShadowResources.getDrawable
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| a7b64b610c4c404aa6ace2289cd3c41916573b28 |
|
10-Aug-2011 |
adriancowham <adrian@zoodles.com> |
modified ShadowResources to return the correct type of Drawable rather than only a BitmapDrawable
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 9daa83d905eccca3b027ce27e4a77b3f57441a1e |
|
05-Aug-2011 |
Jan Berkel <jan.berkel@gmail.com> |
Added support for Resources#getQuantityString
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 5117035453920f3d4d0f3969bdab0305dcdb94ba |
|
29-Jul-2011 |
Joe Moore & Ryan Richard <pair+joe+rrichard@pivotallabs.com> |
Merge remote branch 'upstream/master'
Conflicts:
src/main/java/com/xtremelabs/robolectric/shadows/ShadowAlertDialog.java
src/test/java/com/xtremelabs/robolectric/shadows/AlertDialogTest.java
src/test/java/com/xtremelabs/robolectric/shadows/DialogTest.java
|
| 73d4a15f75e5175c3b07de348834dd2d6684aae5 |
|
21-Jul-2011 |
Aaron Day <aarond@spindance.com> |
Add basic LayerDrawable support.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 85af7906879a68c99b1878dac22605fa32454f3f |
|
29-Jun-2011 |
Rich Humphrey <rich@zoodles.com> |
Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 6d2daa795cd59a43fbebc4e10e0a314a5440bb59.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 6d2daa795cd59a43fbebc4e10e0a314a5440bb59 |
|
29-Jun-2011 |
Rich Humphrey <rich@zoodles.com> |
Revert "Merge remote branch 'upstream/master'"
This reverts commit 078ad3480205a3a2c95d662980345d1bf972092e, reversing
changes made to 2c9c757ef2fb2ffd9dffb5b4227144d15922bcf4.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 24dca341442cd46d57ee462fa1d0464923cd310e |
|
24-Jun-2011 |
Mike Grafton & Tyler Schultz <pair+mike+tyler@pivotallabs.com> |
guard loading the /res/xml directory
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 5ec242e7f4ba642abb5cc3dceee0dc49ce2f1a3f |
|
23-Mar-2011 |
Rich Humphrey <rich@zoodles.com> |
PreferenceLoader wired into ResourceLoader and ShadowPreferenceActivity
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 3fab0d6b94c13c0ab7fc14b1d7f19dbe10991acb |
|
29-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Read the SDK version out of the AndroidManifest.xml file
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| ba7a1270d36fb28e5f90be135431700c4ce81504 |
|
28-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
fixed menu loading
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 0e1c92ca35030e2c173b141c41341636bbb7a258 |
|
27-Jan-2011 |
Christian Williams <xian@squareup.com> |
Add shadow for ViewStub.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| d05d28aca7ef2f1eba0714fc46a2ed4165a5902a |
|
26-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Move properties processing into PropertiesHelper
Do more thorough variable expansion for properties
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 1129ee5ffaf1069c1f6c396547eb3e8719391522 |
|
25-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Be tolerant of being unable to find the Android SDK.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 6731901bf801095b2f18951b7b7885231d3c0d7e |
|
25-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Perform variable substitution on sdk.dir from the local.properties file
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| e759ba9296f7cf3063cdcab5f288ab6604d80ddb |
|
22-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Refactored the initialization of ResourceLoader and made it fail gracefully when system resources cannot be found instead of blowing up.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| ae5f1ea065ee257badf6157ea5efd28814205e63 |
|
21-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Removed the strategy of using the jar file containing R.class as basis for searching for the Android APIs
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.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/ResourceLoader.java
|
| 828b5524de2393f92fdd52204c16a75e608db62f |
|
21-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Revert "Revert "Search for the Android SDK using various methods""
This reverts commit 32157e146dafa3b75cbe5650e820eae29b5061c2.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 32157e146dafa3b75cbe5650e820eae29b5061c2 |
|
21-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Revert "Search for the Android SDK using various methods"
This reverts commit 6a85565da2f3ce4187865d9cee2da58e992a4650.
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.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/ResourceLoader.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
|
| 6a85565da2f3ce4187865d9cee2da58e992a4650 |
|
18-Jan-2011 |
Phil Goodwin <pair+phil@pivotallabs.com> |
Search for the Android SDK using various methods
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.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/ResourceLoader.java
|
| f39fe294d5f46799c3a8a33812f4284d5986e0a5 |
|
12-Jan-2011 |
Christian Williams & Phil Goodwin <pair+xian+phil@pivotallabs.com> |
Merge branch 'SpinnerTest' of https://github.com/palfrey/robolectric into palfrey-SpinnerTest
|
| a6ff2c2b15018092af3a28697b521d1ca5e789f0 |
|
12-Jan-2011 |
Christian Williams & Phil Goodwin <pair+xian+phil@pivotallabs.com> |
Find assets directory based on configuration data and RobolectricConfig to hold that data.
Moved the "assets" directory under "test".
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 0000c45923004dac59f6de64f72043c362b95574 |
|
09-Jan-2011 |
Tom Parker <palfrey@tevp.net> |
Remove old println from ResourceLoader
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| 3a134fadfbb8f2a516d990ae1f811af2e9778767 |
|
03-Jan-2011 |
Tom Parker <palfrey@tevp.net> |
Load various resources from system sources as well as local
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
|
| ae900fec33a21d064e5c803dffafba69e02a6682 |
|
03-Jan-2011 |
Tom Parker <palfrey@tevp.net> |
Pull in ids from android.R
/external/robolectric/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.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
|
| 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/ResourceLoader.java
|