Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev

Browse Source 
* commit '515699a4a0235d8cd39fd586067e9d2857e6bda4':
  Use Calendar day of week rather than Time in SimpleMonthView
This commit is contained in:
Alan Viverette
2014-09-11 01:38:54 +00:00
committed by Android Git Automerger
parent f11a7097ad 0c1964e76d
commit a36b7c236e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/widget/SimpleMonthView.java
View File

@@ -31,6 +31,7 @@ import android.text.format.DateFormat;
import android.text.format.DateUtils;
import android.text.format.Time;
import android.util.AttributeSet;
import android.util.MathUtils;
import android.view.MotionEvent;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
@@ -300,7 +301,11 @@ class SimpleMonthView extends View {
}
private static boolean isValidDayOfWeek(int day) {
return (day >= Time.SUNDAY && day <= Time.SATURDAY);
return day >= Calendar.SUNDAY && day <= Calendar.SATURDAY;
}
private static boolean isValidMonth(int month) {
return month >= Calendar.JANUARY && month <= Calendar.DECEMBER;
}
/**
@@ -312,8 +317,8 @@ class SimpleMonthView extends View {
* @param selectedDay the selected day of the month, or -1 for no selection.
* @param month the month.
* @param year the year.
* @param weekStart which day the week should start on. {@link Time#SUNDAY} through
* {@link Time#SATURDAY}.
* @param weekStart which day the week should start on. {@link Calendar#SUNDAY} through
* {@link Calendar#SATURDAY}.
* @param enabledDayStart the first enabled day.
* @param enabledDayEnd the last enabled day.
*/
@@ -325,7 +330,7 @@ class SimpleMonthView extends View {
mSelectedDay = selectedDay;
if (month >= Calendar.JANUARY && month <= Calendar.DECEMBER) {
if (isValidMonth(month)) {
mMonth = month;
}
mYear = year;