resolve merge conflicts of ffa1237698 to ub-launcher3-master.
Change-Id: I65beecb5bbbfe9c4b33d6ca639118cb615c4120a
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index 175bad1..46b9b7d 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -82,7 +82,7 @@
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 @@
newStringsIter.remove();
}
}
- sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).commit();
+ sp.edit().putStringSet(APPS_PENDING_INSTALL, newStrings).apply();
}
}
}
@@ -131,7 +131,7 @@
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;
}
}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ca52899..0df3084 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3614,7 +3614,7 @@
mSharedPrefs.edit()
.putInt(QSB_WIDGET_ID, widgetId)
.putString(QSB_WIDGET_PROVIDER, searchProvider.provider.flattenToString())
- .commit();
+ .apply();
}
mAppWidgetHost.setQsbWidgetId(widgetId);
diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java
index 2a5f197..0773bf2 100644
--- a/src/com/android/launcher3/LauncherBackupAgentHelper.java
+++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java
@@ -30,7 +30,7 @@
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 @@
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) {
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index cffcbf2..9b8e894 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -276,9 +276,9 @@
!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();
}
}
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 494ea2f..3fc0b94 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -709,7 +709,7 @@
// 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