commit 13b563bcae015646d19fa9cf2baf7437d4711f8e
author Adam Cohen <adamcohen@google.com> Wed Jan 15 00:26:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 15 00:26:07 2014 +0000
tree 7ae8c027e29ed8ef9e71cb192aa6c187cce8f11d
parent 00c3184fa6fae69123d160b92977799a1a47fa34
parent bc4539df6fd8b0672fbf51a49cba630add5083a3

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

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index aadcd87..7ef812f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4309,12 +4309,13 @@
     }
 
     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);