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

Merge "Pass setEnabled() value in calendar-mode DatePicker delegate" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-06-03 23:19:53 +00:00
committed by Android (Google) Code Review
parent 88ac4e04a5 f7aa9251d0
commit b8da5340f2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/DatePickerCalendarDelegate.java
View File

@@ -115,7 +115,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
R.styleable.DatePicker_internalLayout, R.layout.date_picker_material);
// Set up and attach container.
mContainer = (ViewGroup) inflater.inflate(layoutResourceId, mDelegator);
mContainer = (ViewGroup) inflater.inflate(layoutResourceId, mDelegator, false);
mDelegator.addView(mContainer);
// Set up header views.
final ViewGroup header = (ViewGroup) mContainer.findViewById(R.id.date_picker_header);
@@ -471,7 +472,11 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
@Override
public void setEnabled(boolean enabled) {
mContainer.setEnabled(false);
mContainer.setEnabled(enabled);
mDayPickerView.setEnabled(enabled);
mYearPickerView.setEnabled(enabled);
mHeaderYear.setEnabled(enabled);
mHeaderMonthDay.setEnabled(enabled);
}
@Override
@@ -481,8 +486,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
@Override
public CalendarView getCalendarView() {
throw new UnsupportedOperationException(
"CalendarView does not exists for the new DatePicker");
throw new UnsupportedOperationException("Not supported by calendar-mode DatePicker");
}
@Override