diff options
| author | Alex Stetson <alexstetson@google.com> | 2021-05-05 08:49:15 -0700 |
|---|---|---|
| committer | Alex Stetson <alexstetson@google.com> | 2021-05-06 08:28:19 -0700 |
| commit | aff80d1e141bd939d4eed1f17c11e18ecc7d8cd1 (patch) | |
| tree | 576f30c262547ded2e1e83ffaa9d3da7b5d23aca /src/com/android/settings/development/OverlaySettingsPreferenceController.java | |
| parent | f9ebf6600fe6737134999c065765c2345ffc26a4 (diff) | |
| download | packages_apps_Settings-aff80d1e141bd939d4eed1f17c11e18ecc7d8cd1.tar.gz packages_apps_Settings-aff80d1e141bd939d4eed1f17c11e18ecc7d8cd1.tar.bz2 packages_apps_Settings-aff80d1e141bd939d4eed1f17c11e18ecc7d8cd1.zip | |
Use shared model for non-system overlay toggle
Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.
Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
Diffstat (limited to 'src/com/android/settings/development/OverlaySettingsPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/OverlaySettingsPreferenceController.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/settings/development/OverlaySettingsPreferenceController.java b/src/com/android/settings/development/OverlaySettingsPreferenceController.java index 50f9867297..cd08793a9e 100644 --- a/src/com/android/settings/development/OverlaySettingsPreferenceController.java +++ b/src/com/android/settings/development/OverlaySettingsPreferenceController.java @@ -16,8 +16,10 @@ package com.android.settings.development; +import static com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin.SECURE_OVERLAY_SETTINGS; + import android.content.Context; -import android.content.SharedPreferences; +import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -33,7 +35,6 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController; public class OverlaySettingsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { - public static final String SHARE_PERFS = "overlay_settings"; private static final String KEY_OVERLAY_SETTINGS = "overlay_settings"; public OverlaySettingsPreferenceController(Context context) { @@ -64,10 +65,10 @@ public class OverlaySettingsPreferenceController extends DeveloperOptionsPrefere /** * Check if this setting is enabled or not. */ - public static boolean isOverlaySettingsEnabled(Context context) { - final SharedPreferences editor = context.getSharedPreferences(SHARE_PERFS, - Context.MODE_PRIVATE); - return editor.getBoolean(SHARE_PERFS, false /* defValue */); + @VisibleForTesting + static boolean isOverlaySettingsEnabled(Context context) { + return Settings.Secure.getInt(context.getContentResolver(), + SECURE_OVERLAY_SETTINGS, 0 /* defValue */) != 0; } /** @@ -75,9 +76,8 @@ public class OverlaySettingsPreferenceController extends DeveloperOptionsPrefere */ @VisibleForTesting static void setOverlaySettingsEnabled(Context context, boolean enabled) { - final SharedPreferences editor = context.getSharedPreferences(SHARE_PERFS, - Context.MODE_PRIVATE); - editor.edit().putBoolean(SHARE_PERFS, enabled).apply(); + Settings.Secure.putInt(context.getContentResolver(), + SECURE_OVERLAY_SETTINGS, enabled ? 1 : 0); } @Override |