diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-29 19:25:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-29 19:25:11 +0000 |
commit | 584b9fa4bf2ee428291343f710b6d434255238af (patch) | |
tree | b1eb0b0585e15a92937bc101a7b097e7840a9d32 | |
parent | 9752705e92593adfb60568ac4d059cc776cfceaa (diff) | |
parent | 776c7e63d3b41ee6acfa54a26a76acd32d7802de (diff) | |
download | android_packages_apps_Trebuchet-584b9fa4bf2ee428291343f710b6d434255238af.tar.gz android_packages_apps_Trebuchet-584b9fa4bf2ee428291343f710b6d434255238af.tar.bz2 android_packages_apps_Trebuchet-584b9fa4bf2ee428291343f710b6d434255238af.zip |
Merge "Fix ToggleableGlobalSettingsFlag on user builds" into ub-launcher3-master
-rw-r--r-- | src/com/android/launcher3/config/BaseFlags.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java index 6ad69d78b..fa4ebaf6b 100644 --- a/src/com/android/launcher3/config/BaseFlags.java +++ b/src/com/android/launcher3/config/BaseFlags.java @@ -17,13 +17,16 @@ package com.android.launcher3.config; import static androidx.core.util.Preconditions.checkNotNull; + import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; + import androidx.annotation.GuardedBy; import androidx.annotation.Keep; import androidx.annotation.VisibleForTesting; + import com.android.launcher3.Utilities; import java.util.ArrayList; @@ -95,8 +98,9 @@ abstract class BaseFlags { public static final TogglableFlag APPLY_CONFIG_AT_RUNTIME = new TogglableFlag( "APPLY_CONFIG_AT_RUNTIME", true, "Apply display changes dynamically"); - public static final TogglableFlag ENABLE_TASK_STABILIZER = new TogglableFlag( - "ENABLE_TASK_STABILIZER", false, "Stable task list across fast task switches"); + public static final ToggleableGlobalSettingsFlag ENABLE_TASK_STABILIZER + = new ToggleableGlobalSettingsFlag("ENABLE_TASK_STABILIZER", false, + "Stable task list across fast task switches"); public static final TogglableFlag QUICKSTEP_SPRINGS = new TogglableFlag("QUICKSTEP_SPRINGS", false, "Enable springs for quickstep animations"); @@ -249,11 +253,17 @@ abstract class BaseFlags { @Override void updateStorage(Context context, boolean value) { + if (contentResolver == null) { + return; + } Settings.Global.putInt(contentResolver, getKey(), value ? 1 : 0); } @Override boolean getFromStorage(Context context, boolean defaultValue) { + if (contentResolver == null) { + return defaultValue; + } return Settings.Global.getInt(contentResolver, getKey(), defaultValue ? 1 : 0) == 1; } |