Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 126dd25d authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Update testActivity"

parents 84086bb9 3911cee2

tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/activity.png

−1.93 KiB (5.88 KiB)
Loading image diff...

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    <!-- Base application theme. -->

    <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">

        <item name="myattr">@integer/ten</item>

        <!-- Customize your theme here. -->

        <item name="android:animateFirstView">false</item>

    </style>



</resources>

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

+1 −9
Original line number Diff line number Diff line
@@ -309,15 +309,7 @@ public class Main { 
    /** Test activity.xml */

    @Test

    public void testActivity() throws ClassNotFoundException {

        try {

        renderAndVerify("activity.xml", "activity.png");

        } catch (AssertionError e) {

            // This is a KI in CalendarWidget and DatePicker rendering.

            // Tracker bug: http://b.android.com/214370

            if (!e.getLocalizedMessage().startsWith("Images differ (by 6.5%)")) {

                throw e;

            }

        }

    }



    @Test