diff options
author | Winson Chung <winsonc@google.com> | 2014-01-23 20:21:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-23 20:21:12 +0000 |
commit | 2aaf6e339000646501bc3d73e497a365174fad26 (patch) | |
tree | 6f6604b15bcba4b2d2d07084e2605c6f61d77a86 | |
parent | c2abb6b443592cd1d070e2fa196511e2f6957077 (diff) | |
parent | 0b560dda27dfd341393c1290798a709e6ae57987 (diff) | |
download | android_packages_apps_Trebuchet-2aaf6e339000646501bc3d73e497a365174fad26.tar.gz android_packages_apps_Trebuchet-2aaf6e339000646501bc3d73e497a365174fad26.tar.bz2 android_packages_apps_Trebuchet-2aaf6e339000646501bc3d73e497a365174fad26.zip |
Merge "Adding tighter first run checks for migration clings. (Bug 12626290)" into jb-ub-now-kermit
-rw-r--r-- | src/com/android/launcher3/LauncherClings.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java index 94b062ddc..9d2778cfa 100644 --- a/src/com/android/launcher3/LauncherClings.java +++ b/src/com/android/launcher3/LauncherClings.java @@ -196,7 +196,8 @@ class LauncherClings { SharedPreferences sharedPrefs = mLauncher.getSharedPrefs(); return areClingsEnabled() && !sharedPrefs.getBoolean(FIRST_RUN_CLING_DISMISSED_KEY, false) && - !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false); + !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false) && + LauncherAppState.getLauncherProvider().wasNewDbCreated(); } public void removeFirstRunAndMigrationClings() { diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index c797cc412..eca776931 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -108,6 +108,10 @@ public class LauncherProvider extends ContentProvider { return true; } + public boolean wasNewDbCreated() { + return mOpenHelper.wasNewDbCreated(); + } + @Override public String getType(Uri uri) { SqlArguments args = new SqlArguments(uri, null, null); @@ -343,6 +347,8 @@ public class LauncherProvider extends ContentProvider { private long mMaxItemId = -1; private long mMaxScreenId = -1; + private boolean mNewDbCreated = false; + DatabaseHelper(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); mContext = context; @@ -358,6 +364,10 @@ public class LauncherProvider extends ContentProvider { } } + public boolean wasNewDbCreated() { + return mNewDbCreated; + } + /** * Send notification that we've deleted the {@link AppWidgetHost}, * probably as part of the initial database creation. The receiver may @@ -375,6 +385,7 @@ public class LauncherProvider extends ContentProvider { mMaxItemId = 1; mMaxScreenId = 0; + mNewDbCreated = true; db.execSQL("CREATE TABLE favorites (" + "_id INTEGER PRIMARY KEY," + |