commit 59d504e89bd98d3ec7c9debf554ed53f7948c8b3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 07 16:11:10 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 07 16:11:10 2018 +0000
tree 4fac45bffe4ed702456a7d6bb8b5b5733d6d1c0c
parent 3b7402c2b8cc42ec2871b12836833504ca6049e8
parent 719fcb1561cf3d64320168d0edb3f0f19860412b

Merge "Using proper checks for hardware bitmap usage" into ub-launcher3-master

Android.mk

diff --git a/Android.mk b/Android.mk
index 3bda309..2a32857 100644
--- a/Android.mk
+++ b/Android.mk
@@ -193,6 +193,7 @@
     $(LOCAL_PATH)/quickstep/res \
     $(LOCAL_PATH)/go/res
 
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := full
 
 LOCAL_SDK_VERSION := system_current

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index bf8f64e..19fa391 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -77,7 +77,7 @@
     private static final String OVERVIEW_RES_ID = "overview_panel";
     private static final String WIDGETS_RES_ID = "widgets_list_view";
     static final String LAUNCHER_PKG = "com.google.android.apps.nexuslauncher";
-    static final int WAIT_TIME_MS = 10000;
+    static final int WAIT_TIME_MS = 60000;
     private static final String SWIPE_UP_SETTING_AVAILABLE_RES_NAME =
             "config_swipe_up_gesture_setting_available";
     private static final String SWIPE_UP_ENABLED_DEFAULT_RES_NAME =