Consistently re-enabling the wallpaper when we leave launcher. (Bug 6445085)
Change-Id: I8357677479a693a808097a797b9af6906f4d7801
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index fe9334b..5bd0ac6 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -524,10 +524,6 @@
mPressedIcon.lockDrawableState();
}
- // NOTE: we need to re-enable the wallpaper visibility if we want correct transitions
- // between items that are launched from the workspace and all apps. It will be disabled
- // correctly the next time the window is visible in AppsCustomizeTabHost.
- mLauncher.updateWallpaperVisibility(true);
mLauncher.startActivitySafely(v, appInfo.intent, appInfo);
} else if (v instanceof PagedViewWidget) {
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8b6fee9..984cf31 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -665,6 +665,11 @@
@Override
protected void onPause() {
+ // NOTE: We want all transitions from launcher to act as if the wallpaper were enabled
+ // to be consistent. So re-enable the flag here, and we will re-disable it as necessary
+ // when Launcher resumes and we are still in AllApps.
+ updateWallpaperVisibility(true);
+
super.onPause();
mPaused = true;
mDragController.cancelDrag();