diff options
author | Winson Chung <winsonc@google.com> | 2014-01-21 13:00:26 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:27 -0700 |
commit | a62da2c9a8a9fb7b45553132d4b2de3ef079a5fa (patch) | |
tree | 6cfde4c4b79a1c9ddc504845eea54d08e09479b4 /src/com | |
parent | 624700f9b11cde22d8050cf9bb2010e9e05ec430 (diff) | |
download | android_packages_apps_Trebuchet-a62da2c9a8a9fb7b45553132d4b2de3ef079a5fa.tar.gz android_packages_apps_Trebuchet-a62da2c9a8a9fb7b45553132d4b2de3ef079a5fa.tar.bz2 android_packages_apps_Trebuchet-a62da2c9a8a9fb7b45553132d4b2de3ef079a5fa.zip |
Adding tighter first run checks for migration clings. (Bug 12626290)
Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
Diffstat (limited to 'src/com')
-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 1745e310e..00711fe4b 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 f14c71ace..98cb0a4c4 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -111,6 +111,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); @@ -352,6 +356,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; @@ -367,6 +373,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 @@ -384,6 +394,7 @@ public class LauncherProvider extends ContentProvider { mMaxItemId = 1; mMaxScreenId = 0; + mNewDbCreated = true; db.execSQL("CREATE TABLE favorites (" + "_id INTEGER PRIMARY KEY," + |