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

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

Merge "Block settings when DISALLOW_CONFIG_BRIGHTNESS."

parents e723c9c0 68b03208

res/xml/display_settings.xml

+9 −6
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ 
    settings:keywords="@string/keywords_display"

    settings:initialExpandedChildrenCount="4">



    <Preference

    <com.android.settingslib.RestrictedPreference

        android:key="brightness"

        android:title="@string/brightness"

        settings:keywords="@string/keywords_display_brightness_level">

        settings:keywords="@string/keywords_display_brightness_level"

        settings:useAdminDisabledSummary="true"

        settings:userRestriction="no_config_brightness">

        <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />

    </Preference>

    </com.android.settingslib.RestrictedPreference>



    <com.android.settings.display.NightDisplayPreference

        android:key="night_display"
@@ -38,12 +40,13 @@ 
        settings:keywords="@string/keywords_display_night_display" />



    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->

    <SwitchPreference

    <com.android.settingslib.RestrictedSwitchPreference

        android:key="auto_brightness"

        android:title="@string/auto_brightness_title"

        settings:keywords="@string/keywords_display_auto_brightness"

        android:summary="@string/auto_brightness_summary"

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

        settings:useAdminDisabledSummary="true"

        settings:userRestriction="no_config_brightness" />



    <com.android.settingslib.RestrictedPreference

        android:key="wallpaper"

res/xml/power_usage_summary_legacy.xml

+4 −2
Original line number Diff line number Diff line
@@ -61,11 +61,13 @@ 
            android:summary="@string/battery_percentage_description"/>



        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <SwitchPreference

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="auto_brightness_battery"

            android:title="@string/auto_brightness_title"

            android:summary="@string/auto_brightness_summary"

            settings:keywords="@string/keywords_display_auto_brightness"/>

            settings:keywords="@string/keywords_display_auto_brightness"

            settings:useAdminDisabledSummary="true"

            settings:userRestriction="no_config_brightness" />



        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <com.android.settings.TimeoutListPreference

tests/unit/src/com/android/settings/core/UserRestrictionTest.java

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ public class UserRestrictionTest { 
            UserManager.DISALLOW_CONFIG_TETHERING,

            UserManager.DISALLOW_CONFIG_VPN,

            UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,

            UserManager.DISALLOW_AIRPLANE_MODE

            UserManager.DISALLOW_AIRPLANE_MODE,

            UserManager.DISALLOW_CONFIG_BRIGHTNESS

    );



    @Before