From 0e672148a7c7292efdff0f641177ab06cd9d4968 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Wed, 6 Apr 2016 15:56:11 -0400 Subject: Deprecate methods not supported by Material-style date picker Bug: 28039932 Change-Id: Ide53b42c9197ca9076184adef2e96170dd24785a --- api/current.txt | 10 +++++----- api/system-current.txt | 10 +++++----- api/test-current.txt | 10 +++++----- core/java/android/widget/DatePicker.java | 15 ++++++++++++++- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/api/current.txt b/api/current.txt index 18388b2d3a7c..576b10e0190e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -46436,21 +46436,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); } diff --git a/api/system-current.txt b/api/system-current.txt index 051ed04fcdbc..6dafe8b5e67f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -49533,21 +49533,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); } diff --git a/api/test-current.txt b/api/test-current.txt index fe7b4d38a9e8..69c4c50c3fb2 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -46510,21 +46510,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); } diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index e3357a7738f2..0c5edc5f2f81 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -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. *

- * Note: This method returns {@code null} when the + * Note: 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); } -- cgit v1.2.3-59-g8ed1b