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

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

Merge "Convert auto-brightness switch to a full screen UI." into pi-dev

parents 30d3c493 3dfcb3b3

res/drawable-nodpi/aab_brightness

0 → 100644
+0 −0

Empty file added.

res/raw/aab_brightness.mp4

0 → 100644
+0 −0

Empty file added.

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -6664,6 +6664,8 @@ 
    <string name="help_url_font_size" translatable="false"></string>

    <!-- Help URL, Display size [DO NOT TRANSLATE] -->

    <string name="help_url_display_size" translatable="false"></string>

    <!-- Help URL, Auto brightness [DO NOT TRANSLATE] -->

    <string name="help_url_auto_brightness" translatable="false" />









    <string name="help_url_network_dashboard" translatable="false"></string>









    <string name="help_url_connected_devices" translatable="false"></string>

























res/xml/auto_brightness_detail.xml
0 → 100644



+38
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  Copyright (C) 2018 The Android Open Source Project



















  Licensed under the Apache License, Version 2.0 (the "License");









  you may not use this file except in compliance with the License.









  You may obtain a copy of the License at



















       http://www.apache.org/licenses/LICENSE-2.0



















  Unless required by applicable law or agreed to in writing, software









  distributed under the License is distributed on an "AS IS" BASIS,









  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









  See the License for the specific language governing permissions and









  limitations under the License.









  -->



















<PreferenceScreen









    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="auto_brightness_detail"









    android:title="@string/auto_brightness_title"









    settings:keywords="@string/keywords_display_auto_brightness">



















    <com.android.settings.widget.VideoPreference









        android:key="auto_brightness_video"









        settings:animation="@raw/aab_brightness"









        settings:preview="@drawable/aab_brightness"/>



















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









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="auto_brightness"









        android:title="@string/auto_brightness_title"









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









        settings:useAdminDisabledSummary="true"









        settings:userRestriction="no_config_brightness" />



















</PreferenceScreen>








 No newline at end of file
























res/xml/display_settings.xml



+4
−7






























Original line number
Diff line number
Diff line







@@ -39,15 +39,12 @@







        settings:widgetLayout="@null"









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



















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









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="auto_brightness"









    <Preference









        android:key="auto_brightness_entry"









        android:title="@string/auto_brightness_title"









        android:summary="@string/auto_brightness_summary"









        settings:keywords="@string/keywords_display_auto_brightness"









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









        settings:useAdminDisabledSummary="true"









        settings:userRestriction="no_config_brightness" />









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









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



















    <com.android.settingslib.RestrictedPreference









        android:key="wallpaper"