summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-07-29 11:12:44 -0700
committerDeepanshu Gupta <deepanshu@google.com>2015-07-29 14:27:02 -0700
commit4a6ee98d39ab2300b2cd17c60221e43bf4ade8e7 (patch)
tree357c66e55c7b6258cf1b9f5d0a3a0702f7ea14d3 /tools/layoutlib
parent6e8d8ad2b7cffed751b2a382ac7b761954767188 (diff)
downloadframeworks_base-4a6ee98d39ab2300b2cd17c60221e43bf4ade8e7.zip
frameworks_base-4a6ee98d39ab2300b2cd17c60221e43bf4ade8e7.tar.gz
frameworks_base-4a6ee98d39ab2300b2cd17c60221e43bf4ade8e7.tar.bz2
Fix theme namespace in tests.
The tests used framework theme (Material), but the ResourceResolver was created with project theme. This caused tests to fail becasue of missing resources. Change-Id: Ia17ee19054f6689f85e3423e83c1f47a2cc4364f
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
index b2909c9..ee448ca 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
@@ -285,7 +285,7 @@ public class Main {
ConfigGenerator.getEnumMap(attrs), getLayoutLog());
}
- /** Text activity.xml */
+ /** Test activity.xml */
@Test
public void testActivity() throws ClassNotFoundException {
renderAndVerify("activity.xml", "activity.png");
@@ -404,7 +404,7 @@ public class Main {
ResourceResolver resourceResolver =
ResourceResolver.create(sProjectResources.getConfiguredResources(config),
sFrameworkRepo.getConfiguredResources(config),
- themeName, true);
+ themeName, false);
return new SessionParams(
layoutParser,