Settings: Use the same day sequence for downtime.

Make the starting day (Monday) the same between
the selection dialog and the summary text.

Bug:17390052

Change-Id: I4f884cb5e02c1cc2642ab05915cd94c655b9f362

diff --git a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java b/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
index a380c27..3361ad0 100644 (file)
--- a/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
+++ b/src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
@@ -32,7 +32,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
 public class ZenModeDowntimeDaysSelection extends ScrollView {
-    private static final int[] DAYS = {
+    public static final int[] DAYS = {
         Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY,
         Calendar.SATURDAY, Calendar.SUNDAY
     };

diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 5e24b9d..9ea3c93 100644 (file)
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.notification;
 
+import static com.android.settings.notification.ZenModeDowntimeDaysSelection.DAYS;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -314,8 +316,8 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
             if (days != null && days.length != 0) {
                 final StringBuilder sb = new StringBuilder();
                 final Calendar c = Calendar.getInstance();
-                for (int i = 0; i < ZenModeConfig.ALL_DAYS.length; i++) {
-                    final int day = ZenModeConfig.ALL_DAYS[i];
+                for (int i = 0; i < DAYS.length; i++) {
+                    final int day = DAYS[i];
                     for (int j = 0; j < days.length; j++) {
                         if (day == days[j]) {
                             c.set(Calendar.DAY_OF_WEEK, day);