This implements an explicit toggle to enable/disable automatic 12h/24h time formatting detection based on the current locale. Previously automatic detection was the norm on a freshly wiped device, but could never be re-enabled once either 12h or 24h format was configured. Bug: 32761619 Test: m RunSettingsRoboTests Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7
73 lines
2.8 KiB
XML
73 lines
2.8 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/com.android.settings"
|
|
android:title="@string/date_and_time"
|
|
settings:keywords="@string/keywords_date_and_time">
|
|
|
|
<PreferenceCategory
|
|
android:key="date_time_preference_category">
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="auto_time"
|
|
android:title="@string/date_time_auto"
|
|
android:summaryOn="@string/date_time_auto_summaryOn"
|
|
android:summaryOff="@string/date_time_auto_summaryOff"
|
|
settings:useAdditionalSummary="true"
|
|
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
|
|
|
|
<Preference
|
|
android:key="date"
|
|
android:title="@string/date_time_set_date"
|
|
android:summary="@string/summary_placeholder" />
|
|
|
|
<Preference
|
|
android:key="time"
|
|
android:title="@string/date_time_set_time"
|
|
android:summary="@string/summary_placeholder" />
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="time_zone_preference_category">
|
|
<SwitchPreference
|
|
android:key="auto_zone"
|
|
android:title="@string/zone_auto"
|
|
android:summaryOn="@string/zone_auto_summaryOn"
|
|
android:summaryOff="@string/zone_auto_summaryOff" />
|
|
|
|
<Preference
|
|
android:fragment="com.android.settings.datetime.ZonePicker"
|
|
android:key="timezone"
|
|
android:title="@string/date_time_set_timezone"
|
|
android:summary="GMT-8:00" />
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="time_format_preference_category">
|
|
<SwitchPreference
|
|
android:key="auto_24hour"
|
|
android:title="@string/date_time_24hour_auto"
|
|
android:summaryOn="@string/date_time_24hour_auto_summary"
|
|
android:summaryOff="@string/date_time_24hour_auto_summary" />
|
|
|
|
<SwitchPreference
|
|
android:key="24 hour"
|
|
android:title="@string/date_time_24hour" />
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen>
|