diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 4 | ||||
| -rw-r--r-- | 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 fe9334b81..5bd0ac655 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 8b6fee92d..984cf3162 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(); |