- Convert NightDisplaySettings to a DashboardFragment - Add preference controllers for all Night Display settings - Change UX for activation from a toggle to a button Bug: 73739388 Bug: 69912911 Test: make -j100 and make RunSettingsRoboTests -j100 Change-Id: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063 Merged-In: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
		
			
				
	
	
		
			58 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
			
		
		
	
	
			58 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
| <?xml version="1.0" encoding="utf-8"?>
 | |
| <!-- Copyright (C) 2016 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:title="@string/night_display_title"
 | |
|     android:key="night_display_title"
 | |
|     settings:keywords="@string/keywords_display_night_display">
 | |
| 
 | |
|     <DropDownPreference
 | |
|         android:key="night_display_auto_mode"
 | |
|         android:title="@string/night_display_auto_mode_title"
 | |
|         android:summary="%s"
 | |
|         settings:controller="com.android.settings.display.NightDisplayAutoModePreferenceController" />
 | |
| 
 | |
|     <Preference
 | |
|         android:key="night_display_start_time"
 | |
|         android:title="@string/night_display_start_time_title"
 | |
|         settings:controller="com.android.settings.display.NightDisplayCustomStartTimePreferenceController" />
 | |
| 
 | |
|     <Preference
 | |
|         android:key="night_display_end_time"
 | |
|         android:title="@string/night_display_end_time_title"
 | |
|         settings:controller="com.android.settings.display.NightDisplayCustomEndTimePreferenceController" />
 | |
| 
 | |
|     <com.android.settings.widget.SeekBarPreference
 | |
|         android:key="night_display_temperature"
 | |
|         android:title="@string/night_display_temperature_title"
 | |
|         settings:keywords="@string/keywords_display_night_display"
 | |
|         settings:controller="com.android.settings.display.NightDisplayIntensityPreferenceController" />
 | |
| 
 | |
|     <com.android.settings.applications.LayoutPreference
 | |
|         android:key="night_display_activated"
 | |
|         android:title="@string/night_display_status_title"
 | |
|         android:selectable="false"
 | |
|         android:layout="@layout/night_display_activation_button"
 | |
|         settings:keywords="@string/keywords_display_night_display"
 | |
|         settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController" />
 | |
| 
 | |
|     <PreferenceCategory android:key="night_display_footer_category">
 | |
|         <com.android.settingslib.widget.FooterPreference />
 | |
|     </PreferenceCategory>
 | |
| 
 | |
| </PreferenceScreen> |