summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherModel.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-04-17 00:53:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-17 00:53:52 +0000
commit76ac344cb61a74267c04249c9e9feec41a82c504 (patch)
tree8d561387d94ef5397098fc4f907b7904c3fe0d89 /src/com/android/launcher3/LauncherModel.java
parentd83ebf9270e90d9306ad4eaf6837dea91ca3b172 (diff)
parent0bfccebc9b276b857c992790232cc8477a8a3504 (diff)
downloadandroid_packages_apps_Trebuchet-76ac344cb61a74267c04249c9e9feec41a82c504.tar.gz
android_packages_apps_Trebuchet-76ac344cb61a74267c04249c9e9feec41a82c504.tar.bz2
android_packages_apps_Trebuchet-76ac344cb61a74267c04249c9e9feec41a82c504.zip
Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r--src/com/android/launcher3/LauncherModel.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e5eca625b..d8645aa57 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();