diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-08-05 17:45:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-05 17:45:45 -0700 |
commit | 9275c820e0793d28b4e09ec280057ab2bc31381d (patch) | |
tree | 53fc1d3786bb262adb46d0a4e1c813165352a4fc /src/com/android | |
parent | 12179199816b6205a788e31ac8d38b96d6de53ad (diff) | |
parent | 2c848d029c2fa5bf7e51e1e87eb5e554006cb7da (diff) | |
download | android_packages_apps_Trebuchet-9275c820e0793d28b4e09ec280057ab2bc31381d.tar.gz android_packages_apps_Trebuchet-9275c820e0793d28b4e09ec280057ab2bc31381d.tar.bz2 android_packages_apps_Trebuchet-9275c820e0793d28b4e09ec280057ab2bc31381d.zip |
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
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsStore.java | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index be2001f0e..74a98633e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1907,6 +1907,10 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 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 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, @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); diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java index 1ff50296c..a505240bb 100644 --- a/src/com/android/launcher3/allapps/AllAppsStore.java +++ b/src/com/android/launcher3/allapps/AllAppsStore.java @@ -88,6 +88,10 @@ public class AllAppsStore { } } + public void disableDeferUpdatesSilently(int flag) { + mDeferUpdatesFlags &= ~flag; + } + public int getDeferUpdatesFlags() { return mDeferUpdatesFlags; } |