diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-01-15 00:26:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-15 00:26:07 +0000 |
| commit | 13b563bcae015646d19fa9cf2baf7437d4711f8e (patch) | |
| tree | 7ae8c027e29ed8ef9e71cb192aa6c187cce8f11d | |
| parent | 00c3184fa6fae69123d160b92977799a1a47fa34 (diff) | |
| parent | bc4539df6fd8b0672fbf51a49cba630add5083a3 (diff) | |
| download | android_packages_apps_Trebuchet-13b563bcae015646d19fa9cf2baf7437d4711f8e.tar.gz android_packages_apps_Trebuchet-13b563bcae015646d19fa9cf2baf7437d4711f8e.tar.bz2 android_packages_apps_Trebuchet-13b563bcae015646d19fa9cf2baf7437d4711f8e.zip | |
Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index aadcd8799..7ef812f85 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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); |