Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76ac344c authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

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

parents d83ebf92 0bfccebc

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -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 -->

src/com/android/launcher3/LauncherModel.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

src/com/android/launcher3/LauncherProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -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();