openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 55f77f98: Merge "Showing clings only after the intro has completed" into ub-now-porkchop 

* commit '55f77f983afeffd2240ccd24d783e6d8d3ab44fd':
  Showing clings only after the intro has completed
This commit is contained in:
Adam Cohen 2014-09-09 15:07:53 +00:00 committed by Android Git Automerger
parent 3e1897b3a7 55f77f983a
commit 7c938d99a5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/launcher3/Launcher.java
View File

@ -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);