Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 607478b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I9185949e,Ia0f15fd7 

* changes:
  Remove advanced button from location settings
  Update strings on date & time setting.
parents 83e6a687 c7cef5ee

res/values/strings.xml

+6 −21
Original line number Diff line number Diff line
@@ -729,41 +729,26 @@ 
    <!-- 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>

    <!-- 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>

    <!-- Date & time setting screen setting option summary text when Automatic check box is selected

        (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

    <string name="date_time_auto">Use network-provided time</string>

    <!-- 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)

        [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]  -->

    <string name="zone_auto_summaryOn">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>

    <string name="zone_auto_title">Use network-provided time zone</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>

    <string name="date_time_24hour_auto">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 -->

    <string name="date_time_24hour">Use 24-hour format</string>

    <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->

    <string name="date_time_set_time_title">Time</string>

    <!-- Date & time setting screen setting option title -->

    <string name="date_time_set_time">Set time</string>

    <!-- 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="time_format_category_title">Time format</string>

    <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->

    <string name="date_time_set_timezone_title">Time zone</string>

    <!-- Date & time setting screen setting option title -->

    <string name="date_time_set_timezone">Select time zone</string>

    <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->

    <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 -->

    <string name="date_time_search_region">Search region</string>

    <!-- Setting option title to select region in time zone setting screen [CHAR LIMIT=30] -->

res/xml/date_time_prefs.xml

+7 −13
Original line number Diff line number Diff line
@@ -27,20 +27,18 @@ 
        <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:userRestriction="no_config_date_time" />



        <com.android.settingslib.RestrictedPreference

            android:key="date"

            android:title="@string/date_time_set_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"

            android:title="@string/date_time_set_time_title"

            android:summary="@string/summary_placeholder"

            settings:userRestriction="no_config_date_time" />

    </PreferenceCategory>
@@ -50,27 +48,23 @@ 
        android:layout="@layout/preference_category_no_label">

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="auto_zone"

            android:title="@string/zone_auto"

            android:summaryOn="@string/zone_auto_summaryOn"

            android:summaryOff="@string/zone_auto_summaryOff"

            android:title="@string/zone_auto_title"

            settings:userRestriction="no_config_date_time" />



        <com.android.settingslib.RestrictedPreference

            android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"

            android:key="timezone"

            android:title="@string/date_time_set_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" />

    </PreferenceCategory>



    <PreferenceCategory

        android:key="time_format_preference_category"

        android:layout="@layout/preference_category_no_label">

        android:title="@string/time_format_category_title">

        <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" />

            android:title="@string/date_time_24hour_auto"/>



        <SwitchPreference

            android:key="24 hour"

res/xml/location_settings.xml

+42 −43
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="location_settings"

    android:title="@string/location_settings_title"
@@ -26,9 +27,7 @@ 
        android:selectable="false"

        settings:allowDividerBelow="true"/>



        <PreferenceCategory

            android:key="location_advanced_settings"

            settings:initialExpandedChildrenCount="2">

    <PreferenceCategory android:key="location_advanced_settings">



        <!-- This preference category gets removed if new_recent_location_ui is disabled -->

        <Preference