Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix layoutlib expand unit test" into nyc-dev

Browse Source 
am: e6423ee0ed

* commit 'e6423ee0eda00466172d86917d6d66112974f342':
  Fix layoutlib expand unit test
This commit is contained in:
Diego Perez
2016-03-02 09:15:36 +00:00
committed by android-build-merger
parent 57e047dcb0 e6423ee0ed
commit 151df69f5f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
View File

@@ -335,7 +335,7 @@ public class Main {
.setNavigation(Navigation.NONAV);
SessionParams params = getSessionParams(parser, customConfigGenerator,
layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", false,
layoutLibCallback, "Theme.Material.Light.NoActionBar.Fullscreen", false,
RenderingMode.V_SCROLL, 22);
renderAndVerify(params, "expand_vert_layout.png");
@@ -348,7 +348,7 @@ public class Main {
parser = new LayoutPullParser(APP_TEST_RES + "/layout/" +
"expand_horz_layout.xml");
params = getSessionParams(parser, customConfigGenerator,
layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", false,
layoutLibCallback, "Theme.Material.Light.NoActionBar.Fullscreen", false,
RenderingMode.H_SCROLL, 22);
renderAndVerify(params, "expand_horz_layout.png");