diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-04-18 21:32:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-18 21:32:23 +0000 |
| commit | a8171169ff18efc9e0bf5b865dbd35cee06d3fae (patch) | |
| tree | 09d84530072c7ab3902668dacb7795df3b8f3f08 /src/com/android/launcher3/LauncherModel.java | |
| parent | 04b0d0368892f226337adae6e82677cb2b6c64ee (diff) | |
| parent | 76ac344cb61a74267c04249c9e9feec41a82c504 (diff) | |
| download | android_packages_apps_Trebuchet-a8171169ff18efc9e0bf5b865dbd35cee06d3fae.tar.gz android_packages_apps_Trebuchet-a8171169ff18efc9e0bf5b865dbd35cee06d3fae.tar.bz2 android_packages_apps_Trebuchet-a8171169ff18efc9e0bf5b865dbd35cee06d3fae.zip | |
am 76ac344c: Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly
* commit '76ac344cb61a74267c04249c9e9feec41a82c504':
Allow the old launcher content URI to be overrided
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 9311723ae..bedd44041 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -194,7 +194,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(); |