Add an Automatic Time Zone setting to Date & Time settings.
User can now enable auto-time but disable auto-timezone, especially if we don't have NITZ time from the cell network (or wifi only) and only have NTP time that gives us date and time.
This commit is contained in:
@@ -4,9 +4,9 @@
|
||||
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.
|
||||
@@ -16,31 +16,36 @@
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/date_and_time">
|
||||
<CheckBoxPreference android:key="auto_time"
|
||||
<CheckBoxPreference android:key="auto_time"
|
||||
android:title="@string/date_time_auto"
|
||||
android:summaryOn="@string/date_time_auto_summaryOn"
|
||||
android:summaryOff="@string/date_time_auto_summaryOff"
|
||||
/>
|
||||
<Preference android:key="date"
|
||||
android:title="@string/date_time_set_date"
|
||||
<CheckBoxPreference android:key="auto_zone"
|
||||
android:title="@string/zone_auto"
|
||||
android:summaryOn="@string/zone_auto_summaryOn"
|
||||
android:summaryOff="@string/zone_auto_summaryOff"
|
||||
/>
|
||||
<Preference android:key="date"
|
||||
android:title="@string/date_time_set_date"
|
||||
android:summary="03/10/2008"
|
||||
/>
|
||||
<Preference android:key="time"
|
||||
android:title="@string/date_time_set_time"
|
||||
android:summary="12:00am"
|
||||
/>
|
||||
<PreferenceScreen
|
||||
android:fragment="com.android.settings.ZonePicker"
|
||||
android:key="timezone"
|
||||
android:title="@string/date_time_set_timezone"
|
||||
android:summary="GMT-8:00"
|
||||
/>
|
||||
<Preference android:key="time"
|
||||
android:title="@string/date_time_set_time"
|
||||
android:summary="12:00am"
|
||||
/>
|
||||
<CheckBoxPreference android:key="24 hour"
|
||||
<CheckBoxPreference android:key="24 hour"
|
||||
android:title="@string/date_time_24hour"
|
||||
android:summaryOn="@string/date_time_24_hour_sample"
|
||||
android:summaryOff="@string/date_time_12_hour_sample"/>
|
||||
<ListPreference
|
||||
android:key="date_format"
|
||||
android:title="@string/date_time_date_format"
|
||||
android:title="@string/date_time_date_format"
|
||||
android:summary="mm/dd/yyyy"/>
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user