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

Commit fa3b41df authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26866487',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26866487', 'googleplex-android-review.googlesource.com/26866488', 'googleplex-android-review.googlesource.com/26866489', 'googleplex-android-review.googlesource.com/26866490'] into sparse-12117444-L01000030005313047.
SPARSE_CHANGE: Icacf051789ea40d23cd29c16168fbeb204cf8f5b
SPARSE_CHANGE: Icd35365f446296fb53b1068d278d4cf5fd25939e
SPARSE_CHANGE: Iea848c9d92abdf152d3eb827fbe1fb141f4687d7
SPARSE_CHANGE: I20c150845caad1c14cad35f661c31e36def968ac

Change-Id: Ic6086522df4a05c77dc1c6a78de4976a5fc2522a
parents 53187f5c 73c20f52

res/xml/display_settings.xml

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

            android:title="@string/auto_brightness_title"

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

            settings:useAdminDisabledSummary="true"

            settings:userRestriction="no_config_brightness"

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



        <SwitchPreferenceCompat

            android:key="even_dimmer_activated"

            android:title="@string/even_dimmer_display_title"

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

+20 −1
Original line number 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 android.content.Context;

import android.os.Process;

import android.os.UserManager;

import android.provider.Settings;



import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;



import com.android.settingslib.PrimarySwitchPreference;



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

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        if (!(preference instanceof PrimarySwitchPreference)) {

            return;

        }



        PrimarySwitchPreference pref = (PrimarySwitchPreference) preference;

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

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

            pref.setEnabled(false);

            pref.setSwitchEnabled(false);

        }

    }



    @Override

    public CharSequence getSummary() {

        return mContext.getText(isChecked()

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

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.hardware.display.DisplayManager.DisplayListener; 
import android.net.Uri;

import android.os.Handler;

import android.os.Looper;

import android.os.Process;

import android.os.UserManager;

import android.provider.Settings.System;

import android.text.TextUtils;
@@ -116,6 +118,10 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr 


    @Override

    public void updateState(Preference preference) {

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

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

            preference.setEnabled(false);

        }

        updatedSummary(preference);

    }

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

+7 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.settings.display.ScreenTimeoutSettings.FALLBACK_SCREEN 


import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;
@@ -67,9 +68,13 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController 
                    .getString(DISABLED_BY_IT_ADMIN_TITLE,

                            () -> mContext.getString(R.string.disabled_by_policy_title)));

            ((RestrictedPreference) preference).setDisabledByAdmin(admin);

        } else {

            preference.setSummary(getTimeoutSummary(maxTimeout));

            return;

        }

        if (UserManager.get(mContext).hasBaseUserRestriction(

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

            preference.setEnabled(false);

        }

        preference.setSummary(getTimeoutSummary(maxTimeout));

    }



    private CharSequence getTimeoutSummary(long maxTimeout) {