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

Commit 80e11d40 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am db78dc8a: Fix problem where launcher doesn\'t draw after rotation w/...

am db78dc8a: Fix problem where launcher doesn\'t draw after rotation w/ translucent activity above it

* commit 'db78dc8a':
  Fix problem where launcher doesn't draw after rotation w/ translucent activity above it
parents 9c599c2a db78dc8a
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
@@ -286,9 +286,6 @@ public class Launcher extends Activity
    private ArrayList<Runnable> mBindOnResumeCallbacks = new ArrayList<Runnable>();
    private ArrayList<Runnable> mOnResumeCallbacks = new ArrayList<Runnable>();

    // Keep track of whether the user has left launcher
    private static boolean sPausedFromUserAction = false;

    private Bundle mSavedInstanceState;

    private LauncherModel mModel;
@@ -465,7 +462,7 @@ public class Launcher extends Activity
        }

        if (!mRestoring) {
            if (DISABLE_SYNCHRONOUS_BINDING_CURRENT_PAGE || sPausedFromUserAction) {
            if (DISABLE_SYNCHRONOUS_BINDING_CURRENT_PAGE) {
                // If the user leaves launcher, then we should just load items asynchronously when
                // they return.
                mModel.startLoader(true, PagedView.INVALID_RESTORE_PAGE);
@@ -511,11 +508,6 @@ public class Launcher extends Activity
    @Override
    public void onLauncherProviderChange() { }

    protected void onUserLeaveHint() {
        super.onUserLeaveHint();
        sPausedFromUserAction = true;
    }

    /** To be overriden by subclasses to hint to Launcher that we have custom content */
    protected boolean hasCustomContentToLeft() {
        return false;
@@ -971,7 +963,6 @@ public class Launcher extends Activity
        setWorkspaceBackground(mState == State.WORKSPACE);

        mPaused = false;
        sPausedFromUserAction = false;
        if (mRestoring || mOnResumeNeedsLoad) {
            setWorkspaceLoading(true);
            mModel.startLoader(true, PagedView.INVALID_RESTORE_PAGE);