Fix internationalized repeat short days display

The following two commits result in incorrect short weekday
labels when the first day of the week is not Sunday.  Fix.

AOSP lollipop commit:
Repeat date UI selector for alarm
Change-Id: I030c9468e030af8c86a16fc6f9289f83070ffd84

And CM commit:
deskclock: internationalize repeat days layout
Change-Id: I434510a0ad18c33d7e7f856d1db7eaff282d7197

Change-Id: Ib293852748afa5de009aae6af74d0d2fbd3ff267

2 files changed, 7 insertions, 5 deletions

diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java
index 323990940..4d0210b95 100755
--- a/src/com/android/deskclock/AlarmClockFragment.java
+++ b/src/com/android/deskclock/AlarmClockFragment.java
@@ -1011,7 +1011,7 @@ public class AlarmClockFragment extends DeskClockFragment implements
             for (int i = 0; i < 7; i++) {
                 final Button dayButton = (Button) mFactory.inflate(
                         R.layout.day_button, holder.repeatDays, false /* attachToRoot */);
-                dayButton.setText(mShortWeekDayStrings[i]);
+                dayButton.setText(mShortWeekDayStrings[DAY_ORDER[i]]);
                 dayButton.setContentDescription(mLongWeekDayStrings[DAY_ORDER[i]]);
                 holder.repeatDays.addView(dayButton);
                 holder.dayButtons[i] = dayButton;
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index f93ae2f25..fb4695ef5 100755
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
@@ -650,17 +650,19 @@ public class Utils {
     }
 
     /**
-     * To get an array of single-character day of week symbols {'S', 'M', 'T', 'W', 'T', 'F', 'S'}
+     * To get an array of single-character day of week symbols {'S', 'M', 'T', 'W', 'T', 'F', 'S'},
+     * indexed like DateFormatSymbols.getShortWeekdays()
      * @return the array of symbols
      */
     public static String[] getShortWeekdays() {
         if (sShortWeekdays == null) {
-            final String[] shortWeekdays = new String[7];
+            final String[] shortWeekdays = new String[Calendar.SATURDAY + 1];
             final SimpleDateFormat format = new SimpleDateFormat("EEEEE");
             // Create a date (2014/07/20) that is a Sunday
             long aSunday = new GregorianCalendar(2014, Calendar.JULY, 20).getTimeInMillis();
-            for (int day = 0; day < 7; day++) {
-                shortWeekdays[day] = format.format(new Date(aSunday + day * DateUtils.DAY_IN_MILLIS));
+            for (int day = Calendar.SUNDAY; day <= Calendar.SATURDAY; day++) {
+                long offset = (day - Calendar.SUNDAY) * DateUtils.DAY_IN_MILLIS;
+                shortWeekdays[day] = format.format(new Date(aSunday + offset));
             }
             sShortWeekdays = shortWeekdays;
         }