diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-19 16:03:28 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-21 13:34:07 -0700 |
commit | 5c97f51fd9443e461a360ff7852aa223c05d667f (patch) | |
tree | 1190bccb371f1c5e1792375270a657e6364c896c /src/com/android/launcher3/LauncherProvider.java | |
parent | 324d78358c88d30eac587f4e1d679f9b5bf8d2f3 (diff) | |
download | android_packages_apps_Trebuchet-5c97f51fd9443e461a360ff7852aa223c05d667f.tar.gz android_packages_apps_Trebuchet-5c97f51fd9443e461a360ff7852aa223c05d667f.tar.bz2 android_packages_apps_Trebuchet-5c97f51fd9443e461a360ff7852aa223c05d667f.zip |
Icons are not updated to TYPE_APPLICATION during restore
> Use low res only for app shortcuts
> Running icon migration after restore
> Running icon migration again for all users
> Deduping shortcuts added from widget tray
Bug: 20945600
Change-Id: I3bb47545fdd9832510069026fbae8966d2311cc1
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 8bc898855..8fef32daa 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -65,7 +65,7 @@ public class LauncherProvider extends ContentProvider { private static final String TAG = "Launcher.LauncherProvider"; private static final boolean LOGD = false; - private static final int DATABASE_VERSION = 25; + private static final int DATABASE_VERSION = 26; static final String OLD_AUTHORITY = "com.android.launcher2.settings"; static final String AUTHORITY = ProviderConfig.AUTHORITY; @@ -378,6 +378,11 @@ public class LauncherProvider extends ContentProvider { mOpenHelper.updateFolderItemsRank(mOpenHelper.getWritableDatabase(), false); } + public void convertShortcutsToLauncherActivities() { + mOpenHelper.convertShortcutsToLauncherActivities(mOpenHelper.getWritableDatabase()); + } + + public void deleteDatabase() { // Are you sure? (y/n) final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); @@ -623,10 +628,12 @@ public class LauncherProvider extends ContentProvider { } } case 23: - convertShortcutsToLauncherActivities(db); + // No-op case 24: ManagedProfileHeuristic.markExistingUsersForNoFolderCreation(mContext); - case 25: { + case 25: + convertShortcutsToLauncherActivities(db); + case 26: { // DB Upgraded successfully return; } |