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

Commit c51cefb2 authored by Almaz Mingaleev's avatar Almaz Mingaleev Committed by Android (Google) Code Review
Browse files

Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev

parents 16b0f660 ac584f29

res/xml/date_time_prefs.xml

+6 −6
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ 
            settings:allowDividerAbove="true"

            settings:userRestriction="no_config_date_time"/>



        <!-- This preference gets removed if location-based time zone detection is not supported -->

        <SwitchPreference

            android:key="location_time_zone_detection"

            android:title="@string/location_time_zone_detection_toggle_title"

            settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>



        <com.android.settingslib.RestrictedPreference

            android:key="timezone"

            android:title="@string/date_time_set_timezone_title"
@@ -56,12 +62,6 @@ 
            settings:userRestriction="no_config_date_time"

            settings:keywords="@string/keywords_time_zone"/>



        <!-- This preference gets removed if location-based time zone detection is not supported -->

        <SwitchPreference

            android:key="location_time_zone_detection"

            android:title="@string/location_time_zone_detection_toggle_title"

            settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"

        />

    </PreferenceCategory>



    <PreferenceCategory