summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-09-09 09:42:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-09 09:42:16 +0000
commit55f77f983afeffd2240ccd24d783e6d8d3ab44fd (patch)
tree5bb05d015f39fe101714afd46743fcf7cb36a49b /src
parentf9847b9bd3e5286fe10667ec12dab5b4c43355fa (diff)
parent88d60f14f2516b2d725ea1a1700905530932b1fd (diff)
downloadandroid_packages_apps_Trebuchet-55f77f983afeffd2240ccd24d783e6d8d3ab44fd.tar.gz
android_packages_apps_Trebuchet-55f77f983afeffd2240ccd24d783e6d8d3ab44fd.tar.bz2
android_packages_apps_Trebuchet-55f77f983afeffd2240ccd24d783e6d8d3ab44fd.zip
Merge "Showing clings only after the intro has completed" into ub-now-porkchop
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java29
1 files changed, 17 insertions, 12 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e7c658acc..33cc29e67 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -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);