aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly

Browse Source
This commit is contained in:
Adam Cohen
2014-04-17 00:53:52 +00:00
committed by Android (Google) Code Review
parent d83ebf9270 0bfccebc9b
commit 76ac344cb6
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -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 -->

2
src/com/android/launcher3/LauncherModel.java
View File

@@ -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();

4
src/com/android/launcher3/LauncherProvider.java
View File

@@ -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();