summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-01-14 14:05:32 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:25 -0700
commite86ae75fe286ff27394b4f49b4ba12c7d92769dd (patch)
treebe0ab0aac8131ebd2361d4dcdffc6bcce524ce54 /src
parent676ede0a5d21cb30e0ff21ac49db99840003a124 (diff)
downloadandroid_packages_apps_Trebuchet-e86ae75fe286ff27394b4f49b4ba12c7d92769dd.tar.gz
android_packages_apps_Trebuchet-e86ae75fe286ff27394b4f49b4ba12c7d92769dd.tar.bz2
android_packages_apps_Trebuchet-e86ae75fe286ff27394b4f49b4ba12c7d92769dd.zip
Ensure that hasFirstRunActivity is only called when necessary
Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 03fb0fa03..861c627d8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4468,12 +4468,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);