diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-10-31 16:15:36 -0700 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 19:16:31 -0700 |
| commit | 6805e05941cedfa652dfad868436dd8e15221dc2 (patch) | |
| tree | 2088b21da143cd672f92c58543160ecb9a9ae2a9 | |
| parent | 0b5f4e2b91f7fc2d8a42fbb96ef84036a92662cd (diff) | |
| download | android_packages_apps_Trebuchet-6805e05941cedfa652dfad868436dd8e15221dc2.tar.gz android_packages_apps_Trebuchet-6805e05941cedfa652dfad868436dd8e15221dc2.tar.bz2 android_packages_apps_Trebuchet-6805e05941cedfa652dfad868436dd8e15221dc2.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, 17 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index e3b4f952b..07e35a870 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -578,12 +578,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()) { @@ -594,6 +588,14 @@ public class Launcher extends Activity mWorkspace.setLauncherOverlay(mLauncherOverlay); } } + + if (shouldShowIntroScreen()) { + showIntroScreen(); + } else { + showFirstRunActivity(); + showFirstRunClings(); + } + IntentFilter protectedAppsFilter = new IntentFilter( "cyanogenmod.intent.action.PROTECTED_COMPONENT_UPDATE"); registerReceiver(protectedAppsChangedReceiver, protectedAppsFilter, @@ -6007,6 +6009,9 @@ public class Launcher extends Activity if (introScreen != null) { mDragLayer.showOverlayView(introScreen); } + if (mLauncherOverlayContainer != null) { + mLauncherOverlayContainer.setVisibility(View.INVISIBLE); + } } public void dismissIntroScreen() { @@ -6018,11 +6023,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); |