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

Commit 36b6a0a9 authored by Kanyinsola Fapohunda's avatar Kanyinsola Fapohunda Committed by Android (Google) Code Review
Browse files

Merge "Update list item title for GMT+0 in FixedOffsetPicker" into main

parents 404e3187 cebab8db

src/com/android/settings/datetime/timezone/FixedOffsetPicker.java

+3 −2
Original line number Diff line number Diff line
@@ -61,10 +61,11 @@ public class FixedOffsetPicker extends BaseTimeZoneInfoPicker { 
        final TimeZoneInfo.Formatter formatter = new TimeZoneInfo.Formatter(getLocale(),

                new Date());

        final List<TimeZoneInfo> timeZoneInfos = new ArrayList<>();

        timeZoneInfos.add(formatter.format(TimeZone.getFrozenTimeZone("Etc/UTC")));

        // GMT+0 is handled here so it shows up as the first item in the list.

        timeZoneInfos.add(formatter.format(TimeZone.getFrozenTimeZone("Etc/GMT+0")));

        for (int hoursOffset = MAX_HOURS_OFFSET; hoursOffset >= MIN_HOURS_OFFSET; --hoursOffset) {

            if (hoursOffset == 0) {

                // UTC is handled above, so don't add GMT +/-0 again.

                // GMT+0 is handled above, so don't add GMT +/-0 again.

                continue;

            }

            final String id = String.format(Locale.US, "Etc/GMT%+d", hoursOffset);

tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class FixedOffsetPickerTest { 
        TestFixedOffsetPicker picker = new TestFixedOffsetPicker();

        List<TimeZoneInfo> infos = picker.getAllTimeZoneInfos(new TimeZoneData(mFinder));

        List<String> tzIds = infos.stream().map(info -> info.getId()).collect(Collectors.toList());

        assertThat(tzIds).contains("Etc/UTC");

        assertThat(tzIds).contains("Etc/GMT+0");

        assertThat(tzIds).contains("Etc/GMT-14"); // Etc/GMT-14 means GMT+14:00

        assertThat(tzIds).contains("Etc/GMT+12"); // Etc/GMT+14 means GMT-12:00

    }
@@ -66,7 +66,7 @@ public class FixedOffsetPickerTest { 
        BaseTimeZoneAdapter adapter = picker.createAdapter(new TimeZoneData(mFinder));

        assertThat(adapter.getItemCount()).isEqualTo(12 + 1 + 14); // 27 GMT offsets from -12 to +14

        AdapterItem utc = adapter.getDataItem(0);

        assertThat(utc.getTitle().toString()).isEqualTo("Coordinated Universal Time");

        assertThat(utc.getTitle().toString()).isEqualTo("Greenwich Mean Time");

        assertThat(utc.getSummary().toString()).isEqualTo("GMT+00:00");

        AdapterItem gmtMinus12 = adapter.getDataItem(1);

        assertThat(gmtMinus12.getTitle().toString()).isEqualTo("GMT-12:00");