summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-07-29 11:12:44 -0700
committerDeepanshu Gupta <deepanshu@google.com>2015-08-25 12:06:56 -0700
commit5ad4dae1578dd6823da93ee8382f07ec2814e3ba (patch)
tree15a155681dd37743bdaddacd4eb57183627ad718
parent723e136f96a06360a62dc981da1c8ea0ae546660 (diff)
downloadframeworks_base-5ad4dae1578dd6823da93ee8382f07ec2814e3ba.zip
frameworks_base-5ad4dae1578dd6823da93ee8382f07ec2814e3ba.tar.gz
frameworks_base-5ad4dae1578dd6823da93ee8382f07ec2814e3ba.tar.bz2
Fix theme namespace in tests. [DO NOT MERGE]
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 (cherry picked from commit 4a6ee98d39ab2300b2cd17c60221e43bf4ade8e7)
-rw-r--r--tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java2
1 files changed, 1 insertions, 1 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 4c668a7..09f2000 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
@@ -284,7 +284,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");