Merge "Showing clings only after the intro has completed" into ub-now-porkchop (55f77f98) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+17 −12

Original line number	Diff line number	Diff line
		@@ -499,18 +499,7 @@ public class Launcher extends Activity
		showIntroScreen();
		} else {
		showFirstRunActivity();
		}

		// The two first run cling paths are mutually exclusive, if the launcher is preinstalled
		// on the device, then we always show the first run cling experience (or if there is no
		// launcher2). Otherwise, we prompt the user upon started for migration
		LauncherClings launcherClings = new LauncherClings(this);
		if (launcherClings.shouldShowFirstRunOrMigrationClings()) {
		if (mModel.canMigrateFromOldLauncherDb(this)) {
		launcherClings.showMigrationCling();
		} else {
		launcherClings.showLongPressCling(false);
		}
		showFirstRunClings();
		}
		}

		@@ -4942,10 +4931,12 @@ public class Launcher extends Activity
		@Override
		public void run() {
		mDragLayer.dismissOverlayView();
		showFirstRunClings();
		}
		}, ACTIVITY_START_DELAY);
		} else {
		mDragLayer.dismissOverlayView();
		showFirstRunClings();
		}
		changeWallpaperVisiblity(true);
		}
		@@ -4956,6 +4947,20 @@ public class Launcher extends Activity
		editor.apply();
		}

		private void showFirstRunClings() {
		// The two first run cling paths are mutually exclusive, if the launcher is preinstalled
		// on the device, then we always show the first run cling experience (or if there is no
		// launcher2). Otherwise, we prompt the user upon started for migration
		LauncherClings launcherClings = new LauncherClings(this);
		if (launcherClings.shouldShowFirstRunOrMigrationClings()) {
		if (mModel.canMigrateFromOldLauncherDb(this)) {
		launcherClings.showMigrationCling();
		} else {
		launcherClings.showLongPressCling(false);
		}
		}
		}

		void showWorkspaceSearchAndHotseat() {
		if (mWorkspace != null) mWorkspace.setAlpha(1f);
		if (mHotseat != null) mHotseat.setAlpha(1f);