diff options
author | Jason Monk <jmonk@google.com> | 2014-03-21 15:42:06 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2014-03-21 15:42:06 -0400 |
commit | 0bfccebc9b276b857c992790232cc8477a8a3504 (patch) | |
tree | 6f8dfc520e5dfb1b8867302113303285aa2b69f1 /src/com/android/launcher3/LauncherProvider.java | |
parent | fa4c799a9bc6b2eb55ce21609591d49f5c5ea9ba (diff) | |
download | android_packages_apps_Trebuchet-0bfccebc9b276b857c992790232cc8477a8a3504.tar.gz android_packages_apps_Trebuchet-0bfccebc9b276b857c992790232cc8477a8a3504.tar.bz2 android_packages_apps_Trebuchet-0bfccebc9b276b857c992790232cc8477a8a3504.zip |
Allow the old launcher content URI to be overrided
Move the URI used to import favorites from launcher2 to be loaded
from a string resource. This allows it to be overridden.
This will enable permissions fix for GoogleSearch.
Bug: 12058200
Change-Id: I31243fe89f545c9771d5cceffe1c9e7668a42bc5
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |