ac584f2911
This moves the two toggles that control the time zone detection behavior next to each other, rather than having them either side of the current device time zone. This is intended to making it clear they are both influencing detection behavior. It will ensure that future text we put under the auto time zone toggle for the tablet use case (where there is no telephony detection) explaining that "Use location to set time zone" has to be on will be right next to the toggle that needs to change. Bug: 152746236 Bug: 186625820 Test: flashed device, checked manually Change-Id: Ifd43db3d5cc7e764b12f8da20e552b1a5479ac4a
81 lines
3.3 KiB
XML
81 lines
3.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 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/date_and_time"
|
|
settings:keywords="@string/keywords_date_and_time">
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="auto_time"
|
|
android:title="@string/date_time_auto"
|
|
settings:useAdditionalSummary="true"
|
|
settings:userRestriction="no_config_date_time"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="date"
|
|
android:title="@string/date_time_set_date_title"
|
|
android:summary="@string/summary_placeholder"
|
|
settings:userRestriction="no_config_date_time"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="time"
|
|
android:title="@string/date_time_set_time_title"
|
|
android:summary="@string/summary_placeholder"
|
|
settings:userRestriction="no_config_date_time"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="timezone_preference_category"
|
|
android:title="@string/date_time_set_timezone_title">
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="auto_zone"
|
|
android:title="@string/zone_auto_title"
|
|
settings:allowDividerAbove="true"
|
|
settings:userRestriction="no_config_date_time"/>
|
|
|
|
<!-- This preference gets removed if location-based time zone detection is not supported -->
|
|
<SwitchPreference
|
|
android:key="location_time_zone_detection"
|
|
android:title="@string/location_time_zone_detection_toggle_title"
|
|
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="timezone"
|
|
android:title="@string/date_time_set_timezone_title"
|
|
android:summary="@string/summary_placeholder"
|
|
android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"
|
|
settings:userRestriction="no_config_date_time"
|
|
settings:keywords="@string/keywords_time_zone"/>
|
|
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="time_format_preference_category"
|
|
android:title="@string/time_format_category_title"
|
|
settings:keywords="@string/keywords_time_format">
|
|
<SwitchPreference
|
|
android:key="auto_24hour"
|
|
android:title="@string/date_time_24hour_auto"/>
|
|
|
|
<SwitchPreference
|
|
android:key="24 hour"
|
|
android:title="@string/date_time_24hour" />
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen>
|