Merge "Fix DEFER_UPDATES_NEXT_DRAW flag is not unset when binging happens... (0a9e91b6) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -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);

+4 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,10 @@ public class AllAppsStore {
		}
		}

		public void disableDeferUpdatesSilently(int flag) {
		mDeferUpdatesFlags &= ~flag;
		}

		public int getDeferUpdatesFlags() {
		return mDeferUpdatesFlags;
		}