diff options
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 8ba58e56f..b963edd6e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -20,6 +20,10 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- General --> <skip /> + + <!-- URI used to import old favorites. [DO NOT TRANSLATE] --> + <string name="old_launcher_provider_uri" translatable="false">content://com.android.launcher2.settings/favorites?notify=true</string> + <!-- Application name --> <string name="application_name">Launcher3</string> <!-- Accessibility-facing application name --> diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 145d225dc..937f02b74 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -193,7 +193,7 @@ public class LauncherModel extends BroadcastReceiver { mAppsCanBeOnRemoveableStorage = Environment.isExternalStorageRemovable(); ContentProviderClient client = contentResolver.acquireContentProviderClient( - LauncherSettings.Favorites.OLD_CONTENT_URI); + Uri.parse(context.getString(R.string.old_launcher_provider_uri))); mOldContentProviderExists = (client != null); if (client != null) { client.release(); diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 2a645255c..734db65bc 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -329,7 +329,7 @@ public class LauncherProvider extends ContentProvider { public void migrateLauncher2Shortcuts() { mOpenHelper.migrateLauncher2Shortcuts(mOpenHelper.getWritableDatabase(), - LauncherSettings.Favorites.OLD_CONTENT_URI); + Uri.parse(getContext().getString(R.string.old_launcher_provider_uri))); } private static int getDefaultWorkspaceResourceId() { @@ -466,7 +466,7 @@ public class LauncherProvider extends ContentProvider { "/old_favorites?notify=true"); if (!convertDatabase(db, uri, permuteScreensCb, true)) { // Try and upgrade from the Launcher2 db - uri = LauncherSettings.Favorites.OLD_CONTENT_URI; + uri = Uri.parse(mContext.getString(R.string.old_launcher_provider_uri)); if (!convertDatabase(db, uri, permuteScreensCb, false)) { // If we fail, then set a flag to load the default workspace setFlagEmptyDbCreated(); |