commit b884b4b1e465b6670fe9907e68b51887993e02e9
author Adam Cohen <adamcohen@google.com> Wed Jan 15 02:40:05 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 15 02:40:05 2014 -0800
tree 6076b872b3310e245c1ff55336e297950b6504be
parent 5d60fc8f851cd964471c3de22879b43f31dd3517
parent 13b563bcae015646d19fa9cf2baf7437d4711f8e

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

* commit '13b563bcae015646d19fa9cf2baf7437d4711f8e':
  Ensure that hasFirstRunActivity is only called when necessary

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