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

Commit 350529ec authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am e25c5d1c: Prevent discordant state between Workspace and Launcher (issue 15409018) 

* commit 'e25c5d1c':
  Prevent discordant state between Workspace and Launcher (issue 15409018)
parents b3c72043 e25c5d1c

src/com/android/launcher3/Launcher.java

+1 −5
Original line number Diff line number Diff line
@@ -3380,10 +3380,7 @@ public class Launcher extends Activity 
    }



    void showWorkspace(boolean animated, Runnable onCompleteRunnable) {

        if (mWorkspace.isInOverviewMode()) {

            mWorkspace.exitOverviewMode(animated);

        }

        if (mState != State.WORKSPACE) {

        if (mState != State.WORKSPACE || mWorkspace.getState() != Workspace.State.NORMAL) {

            boolean wasInSpringLoadedMode = (mState != State.WORKSPACE);

            mWorkspace.setVisibility(View.VISIBLE);

            hideAppsCustomizeHelper(Workspace.State.NORMAL, animated, false, onCompleteRunnable);
@@ -3472,7 +3469,6 @@ public class Launcher extends Activity 
                }

            }

        }, delay);



    }



    void exitSpringLoadedDragMode() {

src/com/android/launcher3/Workspace.java

+4 −0
Original line number Diff line number Diff line
@@ -2204,6 +2204,10 @@ public class Workspace extends SmoothPagedView 
        updateAccessibilityFlags();

    }



    State getState() {

        return mState;

    }



    private void updateAccessibilityFlags() {

        int accessible = mState == State.NORMAL ?

                ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES :