Merge "Add temporary logging to SimpleMonthView" into nyc-dev am: d969cc6856
am: 9f4f4f3962
* commit '9f4f4f39623322776d94b9636ee1e8a16265e89c':
Add temporary logging to SimpleMonthView
diff --git a/core/java/android/widget/SimpleMonthView.java b/core/java/android/widget/SimpleMonthView.java
index 8a7ce12..43cf5a1 100644
--- a/core/java/android/widget/SimpleMonthView.java
+++ b/core/java/android/widget/SimpleMonthView.java
@@ -33,6 +33,7 @@
import android.text.format.DateFormat;
import android.util.AttributeSet;
import android.util.IntArray;
+import android.util.Log;
import android.util.MathUtils;
import android.util.StateSet;
import android.view.KeyEvent;
@@ -69,6 +70,9 @@
private static final int SELECTED_HIGHLIGHT_ALPHA = 0xB0;
+ /** Temporary until we figure out why the date gets messed up. */
+ private static final boolean DEBUG_WRONG_DATE = true;
+
private final TextPaint mMonthPaint = new TextPaint();
private final TextPaint mDayOfWeekPaint = new TextPaint();
private final TextPaint mDayPaint = new TextPaint();
@@ -189,6 +193,12 @@
}
private void updateDayOfWeekLabels() {
+ if (DEBUG_WRONG_DATE) {
+ Log.d(LOG_TAG, "enter updateDayOfWeekLabels()", new Exception());
+ Log.d(LOG_TAG, "mLocale => " + mLocale);
+ Log.d(LOG_TAG, "mWeekStart => " + mWeekStart);
+ }
+
final Calendar calendar = Calendar.getInstance(mLocale);
calendar.setFirstDayOfWeek(mWeekStart);
@@ -197,6 +207,10 @@
calendar.set(Calendar.DAY_OF_WEEK, i);
mDayOfWeekLabels[i] = formatter.format(calendar.getTime());
}
+
+ if (DEBUG_WRONG_DATE) {
+ Log.d(LOG_TAG, "mDayOfWeekLabels <= " + Arrays.toString(mDayOfWeekLabels));
+ }
}
/**
@@ -760,12 +774,20 @@
* {@link Calendar#SUNDAY} through {@link Calendar#SATURDAY}
*/
public void setFirstDayOfWeek(int weekStart) {
+ if (DEBUG_WRONG_DATE) {
+ Log.d(LOG_TAG, "enter setFirstDayOfWeek(" + weekStart + ")", new Exception());
+ }
+
if (isValidDayOfWeek(weekStart)) {
mWeekStart = weekStart;
} else {
mWeekStart = mCalendar.getFirstDayOfWeek();
}
+ if (DEBUG_WRONG_DATE) {
+ Log.d(LOG_TAG, "mWeekStart <=" + mWeekStart);
+ }
+
updateDayOfWeekLabels();
// Invalidate cached accessibility information.