Merge "Fix DEFER_UPDATES_NEXT_DRAW flag is not unset when binging happens twice" into ub-launcher3-qt-r1-dev

This commit is contained in:
TreeHugger Robot
2019-08-06 00:33:31 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 3 deletions

View File

@@ -1896,6 +1896,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);
}
}
@@ -2249,9 +2253,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);

View File

@@ -80,6 +80,10 @@ public class AllAppsStore {
}
}
public void disableDeferUpdatesSilently(int flag) {
mDeferUpdatesFlags &= ~flag;
}
public int getDeferUpdatesFlags() {
return mDeferUpdatesFlags;
}