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

Commit d7d5bd87 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

resolve merge conflicts of ffa12376 to ub-launcher3-master. 

Change-Id: I65beecb5bbbfe9c4b33d6ca639118cb615c4120a
parents d3b53c3f ffa12376

src/com/android/launcher3/InstallShortcutReceiver.java

+3 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                    strings = new HashSet<String>(strings);

                }

                strings.add(encoded);

                sharedPrefs.edit().putStringSet(APPS_PENDING_INSTALL, strings).commit();

                sharedPrefs.edit().putStringSet(APPS_PENDING_INSTALL, strings).apply();

            }

        }

    }
@@ -110,7 +110,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                        newStringsIter.remove();

                    }

                }

                sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).commit();

                sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).apply();

            }

        }

    }
@@ -131,7 +131,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
                    infos.add(info);

                }

            }

            sharedPrefs.edit().putStringSet(APPS_PENDING_INSTALL, new HashSet<String>()).commit();

            sharedPrefs.edit().putStringSet(APPS_PENDING_INSTALL, new HashSet<String>()).apply();

            return infos;

        }

    }

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -3614,7 +3614,7 @@ public class Launcher extends Activity 
                mSharedPrefs.edit()

                    .putInt(QSB_WIDGET_ID, widgetId)

                    .putString(QSB_WIDGET_PROVIDER, searchProvider.provider.flattenToString())

                    .commit();

                    .apply();

            }



            mAppWidgetHost.setQsbWidgetId(widgetId);

src/com/android/launcher3/LauncherBackupAgentHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.io.IOException; 


public class LauncherBackupAgentHelper extends BackupAgentHelper {



    private static final String TAG = "LauncherBackupAgentHelper";

    private static final String TAG = "LauncherBAHelper";



    private static final String LAUNCHER_DATA_PREFIX = "L";
@@ -93,7 +93,7 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper { 
        if (hasData && mHelper.restoreSuccessful) {

            LauncherSettings.Settings.call(getContentResolver(),

                    LauncherSettings.Settings.METHOD_CLEAR_EMPTY_DB_FLAG);

            LauncherClings.synchonouslyMarkFirstRunClingDismissed(this);

            LauncherClings.markFirstRunClingDismissed(this);



            // Rank was added in v4.

            if (mHelper.restoredBackupVersion <= 3) {

src/com/android/launcher3/LauncherClings.java

+4 −4
Original line number Diff line number Diff line
@@ -276,9 +276,9 @@ class LauncherClings implements OnClickListener, OnKeyListener { 
            !sharedPrefs.getBoolean(MIGRATION_CLING_DISMISSED_KEY, false);

    }



    public static void synchonouslyMarkFirstRunClingDismissed(Context ctx) {

        SharedPreferences.Editor editor = Utilities.getPrefs(ctx).edit();

        editor.putBoolean(WORKSPACE_CLING_DISMISSED_KEY, true);

        editor.commit();

    public static void markFirstRunClingDismissed(Context ctx) {

        Utilities.getPrefs(ctx).edit()

                .putBoolean(WORKSPACE_CLING_DISMISSED_KEY, true)

                .apply();

    }

}

src/com/android/launcher3/LauncherProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ public class LauncherProvider extends ContentProvider { 
                    // available (tablet users). Because one of the possible cling flows (migration)

                    // is very destructive (wipes out workspaces), we want to prevent this from showing

                    // until clear data. We do so by marking that the clings have been shown.

                    LauncherClings.synchonouslyMarkFirstRunClingDismissed(mContext);

                    LauncherClings.markFirstRunClingDismissed(mContext);

                }

                case 17: {

                    // No-op