diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-10-20 10:37:15 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-10-20 10:37:15 -0700 |
| commit | f912beb2ee4b75af1fe8c710d6948b9737fed531 (patch) | |
| tree | a8e5ae80d822105c36ff218b739b735a4d5ba9f6 /src/com/android/launcher3/LauncherClings.java | |
| parent | 38ac73a095c99c18ca31b8d9cd14959a762928b7 (diff) | |
| parent | fe3db428abc07d253b816bf70d6820a8339becbc (diff) | |
| download | android_packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.tar.gz android_packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.tar.bz2 android_packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.zip | |
resolve merge conflicts of fe3db428ab to ub-launcher3-master.
Change-Id: Icc60a61f621fefe9db67b178921e62f7d72d7e5a
Diffstat (limited to 'src/com/android/launcher3/LauncherClings.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherClings.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java index 43d05a659..cffcbf27f 100644 --- a/src/com/android/launcher3/LauncherClings.java +++ b/src/com/android/launcher3/LauncherClings.java @@ -75,9 +75,7 @@ class LauncherClings implements OnClickListener, OnKeyListener { LauncherModel.LOADER_FLAG_CLEAR_WORKSPACE | LauncherModel.LOADER_FLAG_MIGRATE_SHORTCUTS); // Set the flag to skip the folder cling - String spKey = LauncherAppState.getSharedPreferencesKey(); - SharedPreferences sp = mLauncher.getSharedPreferences(spKey, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = sp.edit(); + SharedPreferences.Editor editor = Utilities.getPrefs(mLauncher).edit(); editor.putBoolean(Launcher.USER_HAS_MIGRATED, true); editor.apply(); // Disable the migration cling @@ -279,9 +277,7 @@ class LauncherClings implements OnClickListener, OnKeyListener { } public static void synchonouslyMarkFirstRunClingDismissed(Context ctx) { - SharedPreferences prefs = ctx.getSharedPreferences( - LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE); - SharedPreferences.Editor editor = prefs.edit(); + SharedPreferences.Editor editor = Utilities.getPrefs(ctx).edit(); editor.putBoolean(WORKSPACE_CLING_DISMISSED_KEY, true); editor.commit(); } |