diff options
| author | Alan Viverette <alanv@google.com> | 2015-04-01 17:14:45 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-04-01 17:14:45 -0700 |
| commit | f63757b7a6d06138860640f8e95326dc1ff47646 (patch) | |
| tree | 46e6a70c281e1542488a95d0bf30d93a48e6561c /core/java/android/widget/DayPickerView.java | |
| parent | 79274b3066578bdf184ff4c931c2f6fbbd470d03 (diff) | |
| download | frameworks_base-f63757b7a6d06138860640f8e95326dc1ff47646.zip frameworks_base-f63757b7a6d06138860640f8e95326dc1ff47646.tar.gz frameworks_base-f63757b7a6d06138860640f8e95326dc1ff47646.tar.bz2 | |
Scale month view for small screens, use verbatim span for AM/PM label
Also fixes initial day selection in DatePickerDialog.
Bug: 19933912
Bug: 19937345
Change-Id: I88264a192c087361dbf21b055e74e1facf2506bc
Diffstat (limited to 'core/java/android/widget/DayPickerView.java')
| -rw-r--r-- | core/java/android/widget/DayPickerView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/DayPickerView.java b/core/java/android/widget/DayPickerView.java index e2f8efc..ec2528f 100644 --- a/core/java/android/widget/DayPickerView.java +++ b/core/java/android/widget/DayPickerView.java @@ -187,7 +187,6 @@ class DayPickerView extends ViewPager { * @param setSelected whether to set the specified day as selected */ private void setDate(long timeInMillis, boolean animate, boolean setSelected) { - // Set the selected day if (setSelected) { mSelectedDay.setTimeInMillis(timeInMillis); } @@ -196,6 +195,9 @@ class DayPickerView extends ViewPager { if (position != getCurrentItem()) { setCurrentItem(position, animate); } + + mTempCalendar.setTimeInMillis(timeInMillis); + mAdapter.setSelectedDay(mTempCalendar); } public long getDate() { |