From ca889b34821583ea0e70abb403ebbdfe1a290d9e Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 7 May 2012 15:34:34 -0700 Subject: [PATCH] Consistently re-enabling the wallpaper when we leave launcher. (Bug 6445085) Change-Id: I8357677479a693a808097a797b9af6906f4d7801 --- src/com/android/launcher2/AppsCustomizePagedView.java | 4 ---- src/com/android/launcher2/Launcher.java | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index fe9334b81c..5bd0ac655a 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -524,10 +524,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen 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 8b6fee92df..984cf3162f 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -665,6 +665,11 @@ public final class Launcher extends Activity @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();