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

Commit 6be6c582 authored by Victor Chang's avatar Victor Chang
Browse files

Remove the feature flag and dead code for the old time zone picker 

Created b/77277084 to help Android variants to migrate from
old time zone data source, i.e. ZoneGetter.getZonesList, to
new time zone source, e.g. TimeZoneFinder.

Bug: 72376227
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime
Test: manual
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
parent e978d3da

res/drawable-hdpi/ic_menu_3d_globe.png

deleted100644 → 0
−3.72 KiB
Loading image diff...

res/drawable-mdpi/ic_menu_3d_globe.png

deleted100644 → 0
−2.32 KiB
Loading image diff...

res/drawable-xhdpi/ic_menu_3d_globe.png

deleted100644 → 0
−5.85 KiB
Loading image diff...

res/values/strings.xml

+0 −8
Original line number Diff line number Diff line
@@ -762,16 +762,8 @@ 
    <string name="date_time_search_region">Search region</string>

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

    <string name="date_time_select_region">Region</string>

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

    <string name="date_time_select_zone">Time Zone</string>

    <!-- Setting option title to select time zone in a region -->

    <string name="date_time_set_timezone_in_region">Time zones in <xliff:g id="region" example="United States">%1$s</xliff:g></string>

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

    <string name="date_time_select_fixed_offset_time_zones">Select UTC offset</string>

    <!-- Menu item on Select time zone screen -->

    <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>

    <!-- Menu item on Select time zone screen -->

    <string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>

    <!-- Label describing when a given time zone changes to DST or standard time -->

    <string name="zone_change_to_from_dst"><xliff:g id="time_type" example="Pacific Summer Time">%1$s</xliff:g> starts on <xliff:g id="transition_date" example="Mar 11 2018">%2$s</xliff:g>.</string>

    <!-- Label describing a exemplar location and time zone offset[CHAR LIMIT=NONE] -->

res/xml/date_time_prefs.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
            settings:userRestriction="no_config_date_time" />



        <com.android.settingslib.RestrictedPreference

            android:fragment="com.android.settings.datetime.ZonePicker"

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

            android:key="timezone"

            android:title="@string/date_time_set_timezone"

            android:summary="@string/summary_placeholder"