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

Commit b152bfae authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Add Jakarta to timezone list." into ics-ub-clock-amazon

parents 3d1b3cdc bea96c7e

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ 
        <item>"Auckland"</item>

        <item>"Fiji"</item>

        <item>"Tonga"</item>

        <item>"Jakarta"</item>

    </string-array>



    <!-- Choices for timezones, must be kept in sync with timezone_values. -->
@@ -716,6 +717,7 @@ 
        <item>"Pacific/Auckland"</item>

        <item>"Pacific/Fiji"</item>

        <item>"Pacific/Tongatapu"</item>

        <item>"Asia/Jakarta"</item>

    </string-array>



     <!-- Header in the preferences settings for the section pertaining to alarms -->

src/com/android/deskclock/SettingsActivity.java

+5 −2
Original line number Diff line number Diff line
@@ -282,11 +282,14 @@ public class SettingsActivity extends PreferenceActivity 
        Resources resources = this.getResources();

        String[] ids = resources.getStringArray(R.array.timezone_values);

        String[] labels = resources.getStringArray(R.array.timezone_labels);

        int minLength = ids.length;

        if (ids.length != labels.length) {

            Log.wtf("Timezone ids and labels have different length!");

            // StopShip: Make sure to remove this after we get translations for K

            minLength = Math.min(minLength, labels.length);

            Log.e("Timezone ids and labels have different length!");

        }

        List<TimeZoneRow> timezones = new ArrayList<TimeZoneRow>();

        for (int i = 0; i < ids.length; i++) {

        for (int i = 0; i < minLength; i++) {

            timezones.add(new TimeZoneRow(ids[i], labels[i]));

        }

        Collections.sort(timezones);