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

Merge changes I9185949e,Ia0f15fd7

Browse Source 
* changes:
  Remove advanced button from location settings
  Update strings on date & time setting.
This commit is contained in:
TreeHugger Robot
2019-02-08 22:41:40 +00:00
committed by Android (Google) Code Review
parent 83e6a68743 c7cef5ee43
commit 607478b663
3 changed files with 54 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/values/strings.xml
View File

@@ -729,41 +729,26 @@
<!-- Main Settings screen setting option summary text for the item to go into the date and time settings. --> <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
<string name="date_and_time_settings_summary">Set date, time, time zone, &amp; formats</string> <string name="date_and_time_settings_summary">Set date, time, time zone, &amp; formats</string>
<!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] --> <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
<string name="date_time_auto">Automatic date &amp; time</string> <string name="date_time_auto">Use network-provided time</string>
<!-- Date & time setting screen setting option summary text when Automatic check box is selected <!-- Date & time setting screen setting option text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
(that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
<string name="date_time_auto_summaryOn">Use network-provided time</string>
<!-- Date & time setting screen setting option summary text when Automatic check box is clear
[CHAR LIMIT=100] -->
<string name="date_time_auto_summaryOff">Use network-provided time</string>
<!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
<string name="zone_auto">Automatic time zone</string>
<!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
[CHAR LIMIT=100] --> [CHAR LIMIT=100] -->
<string name="zone_auto_summaryOn">Use network-provided time zone</string> <string name="zone_auto_title">Use network-provided time zone</string>
<!-- 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] --> <!-- 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> <string name="date_time_24hour_auto">Use locale default</string>
<!-- Date & time setting screen setting check box title [CHAR LIMIT=30] --> <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
<string name="date_time_24hour_title">24\u2011hour format</string> <string name="date_time_24hour_title">24\u2011hour format</string>
<!-- Date & time setting screen setting check box title --> <!-- Date & time setting screen setting check box title -->
<string name="date_time_24hour">Use 24-hour format</string> <string name="date_time_24hour">Use 24-hour format</string>
<!-- Date & time setting screen setting option title [CHAR LIMIT=30] --> <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
<string name="date_time_set_time_title">Time</string> <string name="date_time_set_time_title">Time</string>
<!-- Date & time setting screen setting option title --> <!-- Date & time setting screen title for setting time format (allowing user to set device display in 12-hour format or 24-hour format) [CHAR LIMIT=30] -->
<string name="date_time_set_time">Set time</string> <string name="time_format_category_title">Time format</string>
<!-- Date & time setting screen setting option title [CHAR LIMIT=30] --> <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
<string name="date_time_set_timezone_title">Time zone</string> <string name="date_time_set_timezone_title">Time zone</string>
<!-- Date & time setting screen setting option title --> <!-- Date & time setting screen setting option title -->
<string name="date_time_set_timezone">Select time zone</string> <string name="date_time_set_timezone">Select time zone</string>
<!-- Date & time setting screen setting option title [CHAR LIMIT=30] --> <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
<string name="date_time_set_date_title">Date</string> <string name="date_time_set_date_title">Date</string>
<!-- Date & time setting screen setting option title -->
<string name="date_time_set_date">Set date</string>
<!-- Text hint to search region in time zone setting screen --> <!-- Text hint to search region in time zone setting screen -->
<string name="date_time_search_region">Search region</string> <string name="date_time_search_region">Search region</string>
<!-- Setting option title to select region in time zone setting screen [CHAR LIMIT=30] --> <!-- Setting option title to select region in time zone setting screen [CHAR LIMIT=30] -->

20
res/xml/date_time_prefs.xml
View File

@@ -27,20 +27,18 @@
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="auto_time" android:key="auto_time"
android:title="@string/date_time_auto" android:title="@string/date_time_auto"
android:summaryOn="@string/date_time_auto_summaryOn"
android:summaryOff="@string/date_time_auto_summaryOff"
settings:useAdditionalSummary="true" settings:useAdditionalSummary="true"
settings:userRestriction="no_config_date_time" /> settings:userRestriction="no_config_date_time" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="date" android:key="date"
android:title="@string/date_time_set_date" android:title="@string/date_time_set_date_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:userRestriction="no_config_date_time" /> settings:userRestriction="no_config_date_time" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="time" android:key="time"
android:title="@string/date_time_set_time" android:title="@string/date_time_set_time_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:userRestriction="no_config_date_time" /> settings:userRestriction="no_config_date_time" />
</PreferenceCategory> </PreferenceCategory>
@@ -50,27 +48,23 @@
android:layout="@layout/preference_category_no_label"> android:layout="@layout/preference_category_no_label">
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="auto_zone" android:key="auto_zone"
android:title="@string/zone_auto" android:title="@string/zone_auto_title"
android:summaryOn="@string/zone_auto_summaryOn"
android:summaryOff="@string/zone_auto_summaryOff"
settings:userRestriction="no_config_date_time" /> settings:userRestriction="no_config_date_time" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"
android:key="timezone" android:key="timezone"
android:title="@string/date_time_set_timezone" android:title="@string/date_time_set_timezone_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"
settings:userRestriction="no_config_date_time" /> settings:userRestriction="no_config_date_time" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="time_format_preference_category" android:key="time_format_preference_category"
android:layout="@layout/preference_category_no_label"> android:title="@string/time_format_category_title">
<SwitchPreference <SwitchPreference
android:key="auto_24hour" android:key="auto_24hour"
android:title="@string/date_time_24hour_auto" android:title="@string/date_time_24hour_auto"/>
android:summaryOn="@string/date_time_24hour_auto_summary"
android:summaryOff="@string/date_time_24hour_auto_summary" />
<SwitchPreference <SwitchPreference
android:key="24 hour" android:key="24 hour"

83
res/xml/location_settings.xml
View File

@@ -14,50 +14,49 @@
limitations under the License. limitations under the License.
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android"
android:key="location_settings" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/location_settings_title" android:key="location_settings"
settings:keywords="@string/keywords_location"> android:title="@string/location_settings_title"
settings:keywords="@string/keywords_location">
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="apps_dashboard" android:key="apps_dashboard"
android:layout="@layout/app_entities_header" android:layout="@layout/app_entities_header"
android:selectable="false" android:selectable="false"
settings:allowDividerBelow="true" /> settings:allowDividerBelow="true"/>
<PreferenceCategory android:key="location_advanced_settings">
<!-- This preference category gets removed if new_recent_location_ui is disabled -->
<Preference
android:key="app_level_permissions"
android:title="@string/location_app_level_permissions">
<intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">
<extra android:name="android.intent.extra.PERMISSION_NAME"
android:value="android.permission-group.LOCATION"/>
</intent>
</Preference>
<Preference
android:key="location_scanning"
android:title="@string/location_scanning_screen_title"
android:fragment="com.android.settings.location.ScanningSettings"/>
<!-- This preference gets removed if there is no managed profile -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="managed_profile_location_switch"
android:title="@string/managed_profile_location_switch_title"
settings:useAdminDisabledSummary="true"
android:enabled="false"
android:selectable="true"/>
<PreferenceCategory <PreferenceCategory
android:key="location_advanced_settings" android:key="location_services"/>
settings:initialExpandedChildrenCount="2"> </PreferenceCategory>
<!-- This preference category gets removed if new_recent_location_ui is disabled --> <PreferenceCategory
<Preference android:key="location_footer"
android:key="app_level_permissions" settings:allowDividerAbove="false"/>
android:title="@string/location_app_level_permissions">
<intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">
<extra android:name="android.intent.extra.PERMISSION_NAME"
android:value="android.permission-group.LOCATION" />
</intent>
</Preference>
<Preference
android:key="location_scanning"
android:title="@string/location_scanning_screen_title"
android:fragment="com.android.settings.location.ScanningSettings"/>
<!-- This preference gets removed if there is no managed profile -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="managed_profile_location_switch"
android:title="@string/managed_profile_location_switch_title"
settings:useAdminDisabledSummary="true"
android:enabled="false"
android:selectable="true" />
<PreferenceCategory
android:key="location_services" />
</PreferenceCategory>
<PreferenceCategory
android:key="location_footer"
settings:allowDividerAbove="false"/>
</PreferenceScreen> </PreferenceScreen>