Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 229814e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flags for brightness slider"

parents 92a21179 4a18d1f1

packages/SystemUI/res/values/flags.xml

+2 −0
Original line number Diff line number Diff line
@@ -29,4 +29,6 @@ 


    <!-- AOD/Lockscreen alternate layout -->

    <bool name="flag_keyguard_layout">false</bool>



    <bool name="flag_brightness_slider">false</bool>

</resources>

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

+6 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.settings.brightness;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.util.settings.SecureSettings;



import javax.inject.Inject;
@@ -28,11 +29,13 @@ import javax.inject.Inject; 
public class BrightnessControllerSettings {



    private static final String THICK_BRIGHTNESS_SLIDER = "sysui_thick_brightness";

    private final FeatureFlags mFeatureFlags;

    private final boolean mUseThickSlider;

    private final boolean mUseMirrorOnThickSlider;



    @Inject

    public BrightnessControllerSettings(SecureSettings settings) {

    public BrightnessControllerSettings(SecureSettings settings, FeatureFlags featureFlags) {

        mFeatureFlags = featureFlags;

        mUseThickSlider = settings.getInt(THICK_BRIGHTNESS_SLIDER, 0) != 0;

        mUseMirrorOnThickSlider = settings.getInt(THICK_BRIGHTNESS_SLIDER, 0) != 2;

    }
@@ -41,11 +44,11 @@ public class BrightnessControllerSettings { 
    // restart systemui after changing it.

    /** */

    boolean useThickSlider() {

        return mUseThickSlider;

        return mUseThickSlider && mFeatureFlags.useNewBrightnessSlider();

    }



    /** */

    boolean useMirrorOnThickSlider() {

        return mUseMirrorOnThickSlider;

        return !useThickSlider() || (useThickSlider() && mUseMirrorOnThickSlider);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java

+5 −0
Original line number Diff line number Diff line
@@ -61,4 +61,9 @@ public class FeatureFlags { 
    public boolean isKeyguardLayoutEnabled() {

        return mFlagReader.isEnabled(R.bool.flag_keyguard_layout);

    }



    /** b/178485354 */

    public boolean useNewBrightnessSlider() {

        return mFlagReader.isEnabled(R.bool.flag_brightness_slider);

    }

}