summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-17 22:36:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-17 22:36:00 +0000
commitbed5a61fd0b4599c5c8210c7e1b5a04254540177 (patch)
treea7901723312ebf3e9cf072d67da77143c238c914 /core
parent6490ad4ae5033a3fc563c63a5aa94d435e0da351 (diff)
parentd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c (diff)
downloadframeworks_base-bed5a61fd0b4599c5c8210c7e1b5a04254540177.zip
frameworks_base-bed5a61fd0b4599c5c8210c7e1b5a04254540177.tar.gz
frameworks_base-bed5a61fd0b4599c5c8210c7e1b5a04254540177.tar.bz2
am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c': Fix year picker initial range
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/DatePickerCalendarDelegate.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/widget/DatePickerCalendarDelegate.java b/core/java/android/widget/DatePickerCalendarDelegate.java
index e75643ab..61547f6 100644
--- a/core/java/android/widget/DatePickerCalendarDelegate.java
+++ b/core/java/android/widget/DatePickerCalendarDelegate.java
@@ -192,6 +192,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i
mYearPickerView = new YearPickerView(mContext);
mYearPickerView.init(this);
+ mYearPickerView.setRange(mMinDate, mMaxDate);
final int yearSelectedCircleColor = a.getColor(R.styleable.DatePicker_yearListSelectorColor,
defaultHighlightColor);