diff --git a/res/values/strings.xml b/res/values/strings.xml index 4657422a7f..ad3a1c4fb3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -20,6 +20,10 @@ + + + content://com.android.launcher2.settings/favorites?notify=true + Launcher3 diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index e5eca625b8..d8645aa577 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 ad43cba486..0e559a8fb9 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();