PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement auto 12/24h setting toggle."

Browse Source
This commit is contained in:
Joachim Sauer
2017-08-10 16:36:47 +00:00
committed by Android (Google) Code Review
parent 103da1ddd2 95beae0089
commit 8a739a4bd1
7 changed files with 361 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -710,6 +710,10 @@
<!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
[CHAR LIMIT=100] -->
<string name="zone_auto_summaryOff">Use network-provided time zone</string>
<!-- Date & time setting screen setting check box title if the 24 hour setting should be determined automatically [CHAR LIMIT=30] -->
<string name="date_time_24hour_auto">Automatic 24\u2011hour format</string>
<!-- Date & time setting screen setting option summary text for the automatic 24 hour setting checkbox [CHAR LIMIT=100] -->
<string name="date_time_24hour_auto_summary">Use locale default</string>
<!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
<string name="date_time_24hour_title">24\u2011hour format</string>
<!-- Date & time setting screen setting check box title -->

71
res/xml/date_time_prefs.xml
View File

@@ -20,38 +20,53 @@
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"
android:summaryOn="@string/date_time_auto_summaryOn"
android:summaryOff="@string/date_time_auto_summaryOff"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<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" />
<SwitchPreference
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="@string/summary_placeholder" />
<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>
<Preference
android:key="time"
android:title="@string/date_time_set_time"
android:summary="@string/summary_placeholder" />
<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" />
<Preference
android:fragment="com.android.settings.datetime.ZonePicker"
android:key="timezone"
android:title="@string/date_time_set_timezone"
android:summary="GMT-8:00" />
</PreferenceCategory>
<SwitchPreference
android:key="24 hour"
android:title="@string/date_time_24hour" />
<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>