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

Commit 606c2a23 authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge changes I7d112dda,I4374faac,I3b773d07,I421b5495 

* changes:
  Adds test to collect performance metrics
  Add Main back to run in buildbot
  Refactor tests structure
  Update Config.getTime method after the N release
parents 5411246b 373259f2

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java

+5 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ public class Config { 
    }



    public static String getTime(int platformVersion) {

        if (isGreaterOrEqual(platformVersion, M)) {

            return "6:00";

        if (isGreaterOrEqual(platformVersion, N)) {

            return "7:00";

        }

        if (platformVersion < GINGERBREAD) {

            return "2:20";
@@ -98,6 +98,9 @@ public class Config { 
        if (platformVersion < M) {

            return "5:10";

        }

        if (platformVersion < N) {

            return "6:00";

        }

        // Should never happen.

        return "4:04";

    }

tools/layoutlib/bridge/tests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ LOCAL_JAVA_LIBRARIES := layoutlib \ 
			layoutlib_api-prebuilt \

			tools-common-prebuilt \

			sdk-common \

			junit-host

			junit-host \

			guavalib



include $(BUILD_HOST_JAVA_LIBRARY)

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

−11 B (5.92 KiB)
Loading image diff...

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

−15 B (10.6 KiB)
Loading image diff...

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

+5 B (7.19 KiB)
Loading image diff...