Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Flags for brightness slider" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-01 18:13:54 +00:00
committed by Android (Google) Code Review
parent 0838b40ec8 ca884932ad
commit 0ac1939cd6
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/flags.xml
View File

@@ -31,4 +31,6 @@
<!-- AOD/Lockscreen alternate layout --> <!-- AOD/Lockscreen alternate layout -->
<bool name="flag_keyguard_layout">false</bool> <bool name="flag_keyguard_layout">false</bool>
<bool name="flag_brightness_slider">false</bool>
</resources> </resources>

9
packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessControllerSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.settings.brightness; package com.android.systemui.settings.brightness;
import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.statusbar.FeatureFlags;
import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.util.settings.SecureSettings;
import javax.inject.Inject; import javax.inject.Inject;
@@ -28,11 +29,13 @@ import javax.inject.Inject;
public class BrightnessControllerSettings { public class BrightnessControllerSettings {
private static final String THICK_BRIGHTNESS_SLIDER = "sysui_thick_brightness"; private static final String THICK_BRIGHTNESS_SLIDER = "sysui_thick_brightness";
private final FeatureFlags mFeatureFlags;
private final boolean mUseThickSlider; private final boolean mUseThickSlider;
private final boolean mUseMirrorOnThickSlider; private final boolean mUseMirrorOnThickSlider;
@Inject @Inject
public BrightnessControllerSettings(SecureSettings settings) { public BrightnessControllerSettings(SecureSettings settings, FeatureFlags featureFlags) {
mFeatureFlags = featureFlags;
mUseThickSlider = settings.getInt(THICK_BRIGHTNESS_SLIDER, 0) != 0; mUseThickSlider = settings.getInt(THICK_BRIGHTNESS_SLIDER, 0) != 0;
mUseMirrorOnThickSlider = settings.getInt(THICK_BRIGHTNESS_SLIDER, 0) != 2; mUseMirrorOnThickSlider = settings.getInt(THICK_BRIGHTNESS_SLIDER, 0) != 2;
} }
@@ -41,11 +44,11 @@ public class BrightnessControllerSettings {
// restart systemui after changing it. // restart systemui after changing it.
/** */ /** */
boolean useThickSlider() { boolean useThickSlider() {
return mUseThickSlider; return mUseThickSlider && mFeatureFlags.useNewBrightnessSlider();
} }
/** */ /** */
boolean useMirrorOnThickSlider() { boolean useMirrorOnThickSlider() {
return mUseMirrorOnThickSlider; return !useThickSlider() || (useThickSlider() && mUseMirrorOnThickSlider);
} }
} }

5
packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java
View File

@@ -61,4 +61,9 @@ public class FeatureFlags {
public boolean isKeyguardLayoutEnabled() { public boolean isKeyguardLayoutEnabled() {
return mFlagReader.isEnabled(R.bool.flag_keyguard_layout); return mFlagReader.isEnabled(R.bool.flag_keyguard_layout);
} }
/** b/178485354 */
public boolean useNewBrightnessSlider() {
return mFlagReader.isEnabled(R.bool.flag_brightness_slider);
}
} }