commit 9275c820e0793d28b4e09ec280057ab2bc31381d
author Sunny Goyal <sunnygoyal@google.com> Mon Aug 05 17:45:45 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 05 17:45:45 2019 -0700
tree 53fc1d3786bb262adb46d0a4e1c813165352a4fc
parent 12179199816b6205a788e31ac8d38b96d6de53ad
parent 2c848d029c2fa5bf7e51e1e87eb5e554006cb7da

Merge "Fix DEFER_UPDATES_NEXT_DRAW flag is not unset when binging happens twice" into ub-launcher3-qt-r1-dev am: 0a9e91b6e4
am: 2c848d029c

Change-Id: I827430185fbab9433f74f402f382cb004ab744c3

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index be2001f..74a9863 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1907,6 +1907,10 @@
         if (mPendingExecutor != null) {
             mPendingExecutor.markCompleted();
             mPendingExecutor = null;
+
+            // We might have set this flag previously and forgot to clear it.
+            mAppsView.getAppsStore()
+                    .disableDeferUpdatesSilently(AllAppsStore.DEFER_UPDATES_NEXT_DRAW);
         }
     }
 
@@ -2259,9 +2263,7 @@
 
     @Override
     public void executeOnNextDraw(ViewOnDrawExecutor executor) {
-        if (mPendingExecutor != null) {
-            mPendingExecutor.markCompleted();
-        }
+        clearPendingBinds();
         mPendingExecutor = executor;
         if (!isInState(ALL_APPS)) {
             mAppsView.getAppsStore().enableDeferUpdates(AllAppsStore.DEFER_UPDATES_NEXT_DRAW);

src/com/android/launcher3/allapps/AllAppsStore.java

diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java
index 1ff5029..a505240 100644
--- a/src/com/android/launcher3/allapps/AllAppsStore.java
+++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -88,6 +88,10 @@
         }
     }
 
+    public void disableDeferUpdatesSilently(int flag) {
+        mDeferUpdatesFlags &= ~flag;
+    }
+
     public int getDeferUpdatesFlags() {
         return mDeferUpdatesFlags;
     }