diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-08-26 05:57:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-26 05:57:53 +0000 |
| commit | 42e53ecbc146c4b131961e1f1764fcf886204b07 (patch) | |
| tree | f5143d8a334776b4384edb89cafb62b191382d54 | |
| parent | 5078ad325b0da36fe798df1df428d12732548217 (diff) | |
| parent | 66d914018cf605c25fb6b2f53627ef702decbdd1 (diff) | |
| download | frameworks_base-42e53ecbc146c4b131961e1f1764fcf886204b07.zip frameworks_base-42e53ecbc146c4b131961e1f1764fcf886204b07.tar.gz frameworks_base-42e53ecbc146c4b131961e1f1764fcf886204b07.tar.bz2 | |
am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
* commit '66d914018cf605c25fb6b2f53627ef702decbdd1':
Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
| -rw-r--r-- | tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/array_check.png | bin | 9786 -> 5188 bytes | |||
| -rw-r--r-- | tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java | 15 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/array_check.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/array_check.png Binary files differindex 9a13568..336f9d8 100644 --- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/array_check.png +++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/array_check.png 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 09f2000..5562ec5 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 @@ -328,8 +328,8 @@ public class Main { .setNavigation(Navigation.NONAV); SessionParams params = getSessionParams(parser, customConfigGenerator, - layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", RenderingMode.V_SCROLL, - 22); + layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", false, + RenderingMode.V_SCROLL, 22); renderAndVerify(params, "expand_vert_layout.png"); @@ -341,8 +341,8 @@ public class Main { parser = new LayoutPullParser(APP_TEST_RES + "/layout/" + "expand_horz_layout.xml"); params = getSessionParams(parser, customConfigGenerator, - layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", RenderingMode - .H_SCROLL, 22); + layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", false, + RenderingMode.H_SCROLL, 22); renderAndVerify(params, "expand_horz_layout.png"); } @@ -388,7 +388,7 @@ public class Main { // TODO: Set up action bar handler properly to test menu rendering. // Create session params. SessionParams params = getSessionParams(parser, ConfigGenerator.NEXUS_5, - layoutLibCallback, "Theme.Material.Light.DarkActionBar", RenderingMode.NORMAL, 22); + layoutLibCallback, "AppTheme", true, RenderingMode.NORMAL, 22); renderAndVerify(params, goldenFileName); } @@ -397,12 +397,13 @@ public class Main { */ private SessionParams getSessionParams(LayoutPullParser layoutParser, ConfigGenerator configGenerator, LayoutLibTestCallback layoutLibCallback, - String themeName, RenderingMode renderingMode, int targetSdk) { + String themeName, boolean isProjectTheme, RenderingMode renderingMode, int targetSdk) { FolderConfiguration config = configGenerator.getFolderConfig(); ResourceResolver resourceResolver = ResourceResolver.create(sProjectResources.getConfiguredResources(config), sFrameworkRepo.getConfiguredResources(config), - themeName, false); + themeName, isProjectTheme); + return new SessionParams( layoutParser, renderingMode, |
