diff options
author | Adam Cohen <adamcohen@google.com> | 2014-10-31 16:15:36 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-10-31 16:34:42 -0700 |
commit | c3e12c733ea1bac942454237b897d5a321c01072 (patch) | |
tree | e23fc207c3c197fb37e58ca39e54c03d4e6f43f7 | |
parent | 3f9c971e761222dc9fb4e5866f81c5f7a3348992 (diff) | |
download | android_packages_apps_Trebuchet-c3e12c733ea1bac942454237b897d5a321c01072.tar.gz android_packages_apps_Trebuchet-c3e12c733ea1bac942454237b897d5a321c01072.tar.bz2 android_packages_apps_Trebuchet-c3e12c733ea1bac942454237b897d5a321c01072.zip |
Overlay shouldn't show up above Intro screen
bug: 18173340
Change-Id: Icf738a55398023ab6bad5cced05b25e053dec0a2
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7fd8193bd..a2de314d3 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -489,13 +489,6 @@ public class Launcher extends Activity // On large interfaces, we want the screen to auto-rotate based on the current orientation unlockScreenOrientation(true); - if (shouldShowIntroScreen()) { - showIntroScreen(); - } else { - showFirstRunActivity(); - showFirstRunClings(); - } - if (mLauncherCallbacks != null) { mLauncherCallbacks.onCreate(savedInstanceState); if (mLauncherCallbacks.hasLauncherOverlay()) { @@ -506,6 +499,13 @@ public class Launcher extends Activity mWorkspace.setLauncherOverlay(mLauncherOverlay); } } + + if (shouldShowIntroScreen()) { + showIntroScreen(); + } else { + showFirstRunActivity(); + showFirstRunClings(); + } } private LauncherCallbacks mLauncherCallbacks; @@ -5260,6 +5260,9 @@ public class Launcher extends Activity if (introScreen != null) { mDragLayer.showOverlayView(introScreen); } + if (mLauncherOverlayContainer != null) { + mLauncherOverlayContainer.setVisibility(View.INVISIBLE); + } } public void dismissIntroScreen() { @@ -5271,11 +5274,17 @@ public class Launcher extends Activity @Override public void run() { mDragLayer.dismissOverlayView(); + if (mLauncherOverlayContainer != null) { + mLauncherOverlayContainer.setVisibility(View.VISIBLE); + } showFirstRunClings(); } }, ACTIVITY_START_DELAY); } else { mDragLayer.dismissOverlayView(); + if (mLauncherOverlayContainer != null) { + mLauncherOverlayContainer.setVisibility(View.VISIBLE); + } showFirstRunClings(); } changeWallpaperVisiblity(true); |