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

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

Merge "Block settings when DISALLOW_CONFIG_AMBIENT_DISPLAY."

parents e7745b12 b4fc5ced

res/xml/display_settings.xml

+3 −2
Original line number Diff line number Diff line
@@ -99,10 +99,11 @@ 
        android:fragment="com.android.settings.dream.DreamSettings" />



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

    <Preference

    <com.android.settingslib.RestrictedPreference

        android:key="ambient_display"

        android:title="@string/ambient_display_screen_title"

        android:fragment="com.android.settings.display.AmbientDisplaySettings" />

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

        settings:userRestriction="no_ambient_display" />



    <!-- Hide night mode for now

    <ListPreference

res/xml/power_usage_summary_legacy.xml

+3 −2
Original line number Diff line number Diff line
@@ -78,10 +78,11 @@ 
            android:entryValues="@array/screen_timeout_values"/>



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

        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="ambient_display_battery"

            android:title="@string/ambient_display_screen_title"

            android:fragment="com.android.settings.display.AmbientDisplaySettings" />

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

            settings:userRestriction="no_ambient_display" />



    </PreferenceCategory>