diff options
| author | RoboErik <epastern@google.com> | 2011-07-29 11:30:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-29 11:30:21 -0700 |
| commit | 394465270ff2679e31ad983b9c64ebddfa3ca8a0 (patch) | |
| tree | 8663de28b1d4427ad5100bffb70859e1274ac10f /src/com/android/calendar | |
| parent | 91028bc1c35c06caf58cf31b281a10d6c00e3c12 (diff) | |
| parent | 8135093480db642734fb40d9627325bf9e97a8c9 (diff) | |
| download | android_packages_apps_Calendar-394465270ff2679e31ad983b9c64ebddfa3ca8a0.tar.gz android_packages_apps_Calendar-394465270ff2679e31ad983b9c64ebddfa3ca8a0.tar.bz2 android_packages_apps_Calendar-394465270ff2679e31ad983b9c64ebddfa3ca8a0.zip | |
Merge "b/5076687 7 day weeks in title, not 8"
Diffstat (limited to 'src/com/android/calendar')
| -rw-r--r-- | src/com/android/calendar/CalendarViewAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/calendar/CalendarViewAdapter.java b/src/com/android/calendar/CalendarViewAdapter.java index 900e0844..7e053b0e 100644 --- a/src/com/android/calendar/CalendarViewAdapter.java +++ b/src/com/android/calendar/CalendarViewAdapter.java @@ -375,7 +375,8 @@ public class CalendarViewAdapter implements SpinnerAdapter { } long weekStartTime = t.toMillis(true); - long weekEndTime = weekStartTime + DateUtils.WEEK_IN_MILLIS; + // The end of the week is 6 days after the start of the week + long weekEndTime = weekStartTime + DateUtils.WEEK_IN_MILLIS - DateUtils.DAY_IN_MILLIS; // If week start and end is in 2 different months, use short months names Time t1 = new Time(mTimeZone); |