PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Use the same day sequence for downtime.

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

Bug:17390052

Change-Id: I4f884cb5e02c1cc2642ab05915cd94c655b9f362
This commit is contained in:
John Spurlock
2014-09-10 11:38:30 -04:00
parent cddb29544a
commit 1e7dbd455e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
View File

@@ -32,7 +32,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
public class ZenModeDowntimeDaysSelection extends ScrollView { 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.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY,
Calendar.SATURDAY, Calendar.SUNDAY Calendar.SATURDAY, Calendar.SUNDAY
}; };

6
src/com/android/settings/notification/ZenModeSettings.java
View File

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