diff options
author | Adam Cohen <adamcohen@google.com> | 2014-06-20 16:16:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-20 16:16:52 +0000 |
commit | 80e11d40832fbaab73006e15000c20316f2dcca0 (patch) | |
tree | dd38c26e211acf7988f4cdccdca9f46958b56044 | |
parent | 9c599c2aae239aebf77350dea000e594d6162e39 (diff) | |
parent | db78dc8a0aeac2e18c995ed5b7e92b963fca18e5 (diff) | |
download | android_packages_apps_Trebuchet-80e11d40832fbaab73006e15000c20316f2dcca0.tar.gz android_packages_apps_Trebuchet-80e11d40832fbaab73006e15000c20316f2dcca0.tar.bz2 android_packages_apps_Trebuchet-80e11d40832fbaab73006e15000c20316f2dcca0.zip |
am db78dc8a: Fix problem where launcher doesn\'t draw after rotation w/ translucent activity above it
* commit 'db78dc8a0aeac2e18c995ed5b7e92b963fca18e5':
Fix problem where launcher doesn't draw after rotation w/ translucent activity above it
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d76b2382e..ad501a31c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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); |