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/util | |
| 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/util')
| -rw-r--r-- | src/com/android/launcher3/util/TestingUtils.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher3/util/TestingUtils.java b/src/com/android/launcher3/util/TestingUtils.java index 39b80463d..665c37175 100644 --- a/src/com/android/launcher3/util/TestingUtils.java +++ b/src/com/android/launcher3/util/TestingUtils.java @@ -13,6 +13,7 @@ import com.android.launcher3.CustomAppWidget; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; +import com.android.launcher3.Utilities; import java.util.HashMap; @@ -39,9 +40,7 @@ public class TestingUtils { public static void addWeightWatcher(Launcher launcher) { if (MEMORY_DUMP_ENABLED) { - String spKey = LauncherAppState.getSharedPreferencesKey(); - SharedPreferences sp = launcher.getSharedPreferences(spKey, Context.MODE_PRIVATE); - boolean show = sp.getBoolean(SHOW_WEIGHT_WATCHER, true); + boolean show = Utilities.getPrefs(launcher).getBoolean(SHOW_WEIGHT_WATCHER, true); int id = launcher.getResources().getIdentifier("zzz_weight_watcher", "layout", launcher.getPackageName()); |