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

Commit 7465e27d authored by tomhsu's avatar tomhsu
Browse files

Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS 

 - For Adaptive brightness

Fix: 330855652
Test: Manual test. see b/330855652
Change-Id: Iea848c9d92abdf152d3eb827fbe1fb141f4687d7
parent cc10abe1

res/xml/display_settings.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,10 @@ 
            android:key="auto_brightness_entry"

            android:key="auto_brightness_entry"

            android:title="@string/auto_brightness_title"

            android:title="@string/auto_brightness_title"

            android:fragment="com.android.settings.display.AutoBrightnessSettings"

            android:fragment="com.android.settings.display.AutoBrightnessSettings"

            settings:useAdminDisabledSummary="true"

            settings:userRestriction="no_config_brightness"

            settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />

            settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />



        <SwitchPreferenceCompat

        <SwitchPreferenceCompat

            android:key="even_dimmer_activated"

            android:key="even_dimmer_activated"

            android:title="@string/even_dimmer_display_title"

            android:title="@string/even_dimmer_display_title"

src/com/android/settings/display/AutoBrightnessPreferenceController.java

+16 −1
Original line number Original line Diff line number Diff line
@@ -18,11 +18,15 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; 
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;

import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;





import android.content.Context;

import android.content.Context;

import android.os.Process;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings;





import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.core.TogglePreferenceController;



import com.android.settingslib.PrimarySwitchPreference;





public class AutoBrightnessPreferenceController extends TogglePreferenceController {

public class AutoBrightnessPreferenceController extends TogglePreferenceController {
@@ -55,6 +59,17 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll 
                : UNSUPPORTED_ON_DEVICE;

                : UNSUPPORTED_ON_DEVICE;

    }

    }





    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        PrimarySwitchPreference pref = (PrimarySwitchPreference) preference;

        if (pref.isEnabled() && UserManager.get(mContext).hasBaseUserRestriction(

                UserManager.DISALLOW_CONFIG_BRIGHTNESS, Process.myUserHandle())) {

            pref.setEnabled(false);

            pref.setSwitchEnabled(false);

        }

    }



    @Override

    @Override

    public CharSequence getSummary() {

    public CharSequence getSummary() {

        return mContext.getText(isChecked()

        return mContext.getText(isChecked()