157030dcef
Resolved an issue in Settings where sunset/sunrise dark mode failed silently when a location was unavailable. Now, an error dialog is shown, even if location services are enabled, but a specific location is missing. A footer stating the same issue is now present while the location is pending. Existing banner that appears when Location is disabled is now being removed once Location is turned on. Previously the UI would refresh only after exiting and returning to the preference view. Bug: 324548844 Bug: 402025928 Test: atest UiModeManagerServiceTest Flag: EXEMPT bugfix Change-Id: I914937185f11a686b453f929728b6329ebd05389
83 lines
3.7 KiB
XML
83 lines
3.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2019 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/dark_ui_mode"
|
|
settings:keywords="@string/keywords_dark_ui_mode">
|
|
|
|
<com.android.settingslib.widget.TopIntroPreference
|
|
android:key="dark_ui_top_intro"
|
|
settings:searchable="false"
|
|
settings:controller="com.android.settings.display.darkmode.DarkModeTopIntroPreferenceController"/>
|
|
|
|
<com.android.settingslib.widget.MainSwitchPreference
|
|
android:key="dark_ui_activated"
|
|
android:title="@string/dark_theme_main_switch_title"
|
|
settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>
|
|
|
|
<com.android.settingslib.widget.BannerMessagePreference
|
|
android:key="dark_ui_location_off"
|
|
android:title="@string/twilight_mode_location_off_dialog_message"
|
|
settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="display_category"
|
|
android:title="@string/accessibility_screen_option">
|
|
|
|
<SwitchPreferenceCompat
|
|
android:key="toggle_force_invert"
|
|
android:summary="@string/accessibility_force_invert_summary"
|
|
android:title="@string/accessibility_force_invert_title"
|
|
settings:controller="com.android.settings.accessibility.ToggleForceInvertPreferenceController"/>
|
|
|
|
<DropDownPreference
|
|
android:key="dark_ui_auto_mode"
|
|
android:title="@string/dark_ui_auto_mode_title"
|
|
android:summary="%s"
|
|
android:entries="@array/dark_ui_scheduler_preference_titles"
|
|
android:entryValues="@array/dark_ui_scheduler_preference_titles"
|
|
settings:controller="com.android.settings.display.darkmode.DarkModeScheduleSelectorController"
|
|
settings:keywords="@string/keywords_dark_ui_mode"/>
|
|
|
|
<Preference
|
|
android:key="dark_theme_start_time"
|
|
android:title="@string/night_display_start_time_title"
|
|
settings:searchable="false"/>
|
|
|
|
<Preference
|
|
android:key="dark_theme_end_time"
|
|
android:title="@string/night_display_end_time_title"
|
|
settings:searchable="false"/>
|
|
</PreferenceCategory>
|
|
|
|
<com.android.settingslib.widget.FooterPreference
|
|
android:key="dark_theme_connection_footer"
|
|
android:title= "@string/twilight_mode_pending_location"
|
|
android:selectable="false"
|
|
settings:searchable="false"
|
|
settings:controller="com.android.settings.display.darkmode.DarkModePendingLocationPreferenceController" />
|
|
|
|
<com.android.settingslib.widget.FooterPreference
|
|
android:key="dark_theme_custom_bedtime_footer"
|
|
android:title="@string/dark_ui_bedtime_footer_summary"
|
|
android:selectable="false"
|
|
settings:searchable="false"
|
|
settings:controller="com.android.settings.display.darkmode.DarkModeCustomModesPreferenceController" />
|
|
|
|
</PreferenceScreen>
|