Merge "Exposing the CalendarView of the DatePicker."

2 files changed, 22 insertions, 0 deletions

diff --git a/api/current.xml b/api/current.xml
index 37318ff..bf388b1 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -249696,6 +249696,17 @@
 <parameter name="defStyle" type="int">
 </parameter>
 </constructor>
+<method name="getCalendarView"
+ return="android.widget.CalendarView"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getCalendarViewShown"
  return="boolean"
  abstract="false"
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java
index cd3862f..df32c51 100644
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -366,12 +366,23 @@ public class DatePicker extends FrameLayout {
      * Gets whether the {@link CalendarView} is shown.
      *
      * @return True if the calendar view is shown.
+     * @see #getCalendarView()
      */
     public boolean getCalendarViewShown() {
         return mCalendarView.isShown();
     }
 
     /**
+     * Gets the {@link CalendarView}.
+     *
+     * @return The calendar view.
+     * @see #getCalendarViewShown()
+     */
+    public CalendarView getCalendarView () {
+        return mCalendarView;
+    }
+
+    /**
      * Sets whether the {@link CalendarView} is shown.
      *
      * @param shown True if the calendar view is to be shown.