From 5be6c300121091768a47936f5d229153a2174d36 Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Mon, 7 Aug 2017 19:06:57 -0700 Subject: [PATCH] Refactoring for AmbientAlwaysOnPreferenceController Makes a few methods static so we can call them from other locations. Bug: 64256644 Test: robotests Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059 --- ...entDisplayAlwaysOnPreferenceController.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index 160786fb114..b80f65523d6 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java @@ -35,7 +35,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro private final int ON = 1; private final int OFF = 0; - private static final String KEY_ALWAYS_ON = "ambient_display_always_on"; + public static final String KEY_ALWAYS_ON = "ambient_display_always_on"; private static final int MY_USER = UserHandle.myUserId(); private final AmbientDisplayConfiguration mConfig; @@ -59,7 +59,11 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro @Override public void updateState(Preference preference) { - ((SwitchPreference) preference).setChecked(mConfig.alwaysOnEnabled(MY_USER)); + ((SwitchPreference) preference).setChecked(isAlwaysOnEnabled(mConfig)); + } + + public static boolean isAlwaysOnEnabled(AmbientDisplayConfiguration config) { + return config.alwaysOnEnabled(MY_USER); } @Override @@ -75,7 +79,15 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro @Override public boolean isAvailable() { - return mConfig.alwaysOnAvailableForUser(MY_USER); + return isAvailable(mConfig); + } + + public static boolean isAvailable(AmbientDisplayConfiguration config) { + return config.alwaysOnAvailableForUser(MY_USER); + } + + public static boolean accessibilityInversionEnabled(AmbientDisplayConfiguration config) { + return config.accessibilityInversionEnabled(MY_USER); } @Override