Merge "Deprecate methods not supported by Material-style date picker" into nyc-dev (106d380a) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -46438,21 +46438,21 @@ package android.widget {
		ctor public DatePicker(android.content.Context, android.util.AttributeSet);
		ctor public DatePicker(android.content.Context, android.util.AttributeSet, int);
		ctor public DatePicker(android.content.Context, android.util.AttributeSet, int, int);
		method public android.widget.CalendarView getCalendarView();
		method public boolean getCalendarViewShown();
		method public deprecated android.widget.CalendarView getCalendarView();
		method public deprecated boolean getCalendarViewShown();
		method public int getDayOfMonth();
		method public int getFirstDayOfWeek();
		method public long getMaxDate();
		method public long getMinDate();
		method public int getMonth();
		method public boolean getSpinnersShown();
		method public deprecated boolean getSpinnersShown();
		method public int getYear();
		method public void init(int, int, int, android.widget.DatePicker.OnDateChangedListener);
		method public void setCalendarViewShown(boolean);
		method public deprecated void setCalendarViewShown(boolean);
		method public void setFirstDayOfWeek(int);
		method public void setMaxDate(long);
		method public void setMinDate(long);
		method public void setSpinnersShown(boolean);
		method public deprecated void setSpinnersShown(boolean);
		method public void updateDate(int, int, int);
		}

api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -49535,21 +49535,21 @@ package android.widget {
		ctor public DatePicker(android.content.Context, android.util.AttributeSet);
		ctor public DatePicker(android.content.Context, android.util.AttributeSet, int);
		ctor public DatePicker(android.content.Context, android.util.AttributeSet, int, int);
		method public android.widget.CalendarView getCalendarView();
		method public boolean getCalendarViewShown();
		method public deprecated android.widget.CalendarView getCalendarView();
		method public deprecated boolean getCalendarViewShown();
		method public int getDayOfMonth();
		method public int getFirstDayOfWeek();
		method public long getMaxDate();
		method public long getMinDate();
		method public int getMonth();
		method public boolean getSpinnersShown();
		method public deprecated boolean getSpinnersShown();
		method public int getYear();
		method public void init(int, int, int, android.widget.DatePicker.OnDateChangedListener);
		method public void setCalendarViewShown(boolean);
		method public deprecated void setCalendarViewShown(boolean);
		method public void setFirstDayOfWeek(int);
		method public void setMaxDate(long);
		method public void setMinDate(long);
		method public void setSpinnersShown(boolean);
		method public deprecated void setSpinnersShown(boolean);
		method public void updateDate(int, int, int);
		}

api/test-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -46512,21 +46512,21 @@ package android.widget {
		ctor public DatePicker(android.content.Context, android.util.AttributeSet);
		ctor public DatePicker(android.content.Context, android.util.AttributeSet, int);
		ctor public DatePicker(android.content.Context, android.util.AttributeSet, int, int);
		method public android.widget.CalendarView getCalendarView();
		method public boolean getCalendarViewShown();
		method public deprecated android.widget.CalendarView getCalendarView();
		method public deprecated boolean getCalendarViewShown();
		method public int getDayOfMonth();
		method public int getFirstDayOfWeek();
		method public long getMaxDate();
		method public long getMinDate();
		method public int getMonth();
		method public boolean getSpinnersShown();
		method public deprecated boolean getSpinnersShown();
		method public int getYear();
		method public void init(int, int, int, android.widget.DatePicker.OnDateChangedListener);
		method public void setCalendarViewShown(boolean);
		method public deprecated void setCalendarViewShown(boolean);
		method public void setFirstDayOfWeek(int);
		method public void setMaxDate(long);
		method public void setMinDate(long);
		method public void setSpinnersShown(boolean);
		method public deprecated void setSpinnersShown(boolean);
		method public void updateDate(int, int, int);
		}

core/java/android/widget/DatePicker.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -339,7 +339,9 @@ public class DatePicker extends FrameLayout {
		*
		* @return {@code true} if the calendar view is shown
		* @see #getCalendarView()
		* @deprecated Not supported by Material-style {@code calendar} mode
		*/
		@Deprecated
		public boolean getCalendarViewShown() {
		return mDelegate.getCalendarViewShown();
		}
		@@ -347,13 +349,18 @@ public class DatePicker extends FrameLayout {
		/**
		* Returns the {@link CalendarView} used by this picker.
		* <p>
		* <strong>Note:</strong> This method returns {@code null} when the
		* <strong>Note:</strong> This method throws an
		* {@link UnsupportedOperationException} when the
		* {@link android.R.styleable#DatePicker_datePickerMode} attribute is set
		* to {@code calendar}.
		*
		* @return the calendar view
		* @see #getCalendarViewShown()
		* @deprecated Not supported by Material-style {@code calendar} mode
		* @throws UnsupportedOperationException if called when the picker is
		* displayed in {@code calendar} mode
		*/
		@Deprecated
		public CalendarView getCalendarView() {
		return mDelegate.getCalendarView();
		}
		@@ -367,7 +374,9 @@ public class DatePicker extends FrameLayout {
		*
		* @param shown {@code true} to show the calendar view, {@code false} to
		* hide it
		* @deprecated Not supported by Material-style {@code calendar} mode
		*/
		@Deprecated
		public void setCalendarViewShown(boolean shown) {
		mDelegate.setCalendarViewShown(shown);
		}
		@@ -380,7 +389,9 @@ public class DatePicker extends FrameLayout {
		* to {@code calendar}.
		*
		* @return {@code true} if the spinners are shown
		* @deprecated Not supported by Material-style {@code calendar} mode
		*/
		@Deprecated
		public boolean getSpinnersShown() {
		return mDelegate.getSpinnersShown();
		}
		@@ -394,7 +405,9 @@ public class DatePicker extends FrameLayout {
		*
		* @param shown {@code true} to show the spinners, {@code false} to hide
		* them
		* @deprecated Not supported by Material-style {@code calendar} mode
		*/
		@Deprecated
		public void setSpinnersShown(boolean shown) {
		mDelegate.setSpinnersShown(shown);
		}