From: Adam Cohen Date: Thu, 19 Jun 2014 21:50:51 +0000 (-0700) Subject: Fix problem where launcher doesn't draw after rotation w/ translucent activity above it X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db78dc8a;p=android-x86%2Fpackages-apps-Trebuchet.git Fix problem where launcher doesn't draw after rotation w/ translucent activity above it -> Removed some code which caused this. The code was intended to fix a certain issue: "Fixing issue where we were reverting to the first page of the workspace after launching an application from all apps, rotating, and returning home" -> That bug doesn't seem to occur anymore, even with the revert -> See https://googleplex-android-review.googlesource.com/#/c/209561/1 issue 11808251 Change-Id: I14ada19a294d2e5139a9e650d55f1cd985dd00d3 --- 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 mBindOnResumeCallbacks = new ArrayList(); private ArrayList mOnResumeCallbacks = new ArrayList(); - // 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);