Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c848d02 authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Fix DEFER_UPDATES_NEXT_DRAW flag is not unset when binging happens... 

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

Change-Id: Iad5027f7925981de0720ca960e5a8ffdd2a1463c
parents bafd6297 0a9e91b6

src/com/android/launcher3/Launcher.java

+5 −3
Original line number Diff line number Diff line
@@ -1904,6 +1904,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);

        }

    }
@@ -2257,9 +2261,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);

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

+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;

    }