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

Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit

This commit is contained in:
Adam Cohen 2014-01-15 00:26:07 +00:00 committed by Android (Google) Code Review
parent 00c3184fa6 bc4539df6f
commit 13b563bcae
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4309,12 +4309,13 @@ public class Launcher extends Activity
}
private boolean shouldRunFirstRunActivity() {
return !ActivityManager.isRunningInTestHarness();
return !ActivityManager.isRunningInTestHarness() &&
!mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false);
}
public void showFirstRunActivity() {
if (shouldRunFirstRunActivity() && hasFirstRunActivity()
&& !mSharedPrefs.getBoolean(FIRST_RUN_ACTIVITY_DISPLAYED, false)) {
if (shouldRunFirstRunActivity() &&
hasFirstRunActivity()) {
Intent firstRunIntent = getFirstRunActivity();
if (firstRunIntent != null) {
startActivity(firstRunIntent);