Overlay shouldn't show up above Intro screen (c3e12c73) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+16 −7

Original line number	Diff line number	Diff line
		@@ -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);