| commit | 152f6c8e04ee42c8b41ab3f4a5acd21a77d41a87 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 12 11:21:30 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 12 11:21:35 2017 +0000 |
| tree | c73aba0e490a9121a09b2cdabeb67b55f11522ad | |
| parent | c5b2bf18189dd42d738ad23034cf8e9b44e9f4c4 [diff] | |
| parent | 2931eb0d959fc9191ce4f5be79eec887ace60fbd [diff] |
Merge "Disable font test temporarily" into oc-dev
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont.ttf b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont.ttf deleted file mode 100644 index 2852302..0000000 --- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont.ttf +++ /dev/null Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont2.ttf b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont2.ttf deleted file mode 100644 index b7bf5b4..0000000 --- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/font/testfont2.ttf +++ /dev/null Binary files differ
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java index 2b5e0f9..7b565b1 100644 --- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
@@ -389,7 +389,8 @@ assertTrue(sRenderMessages.isEmpty()); } - @Test + //@Test + // Temporarily disabled (b/37725933) public void testFonts() throws ClassNotFoundException { // TODO: styles seem to be broken in TextView renderAndVerify("fonts_test.xml", "font_test.png");