[MaterialDatePicker] Ability to Start Picker in MaterialTextInputPicker Mode

Resolves #867
Resolves #865

GIT_ORIGIN_REV_ID=de3f50710c06d17331d366eb9b4d240ec205a1f8
Co-authored-by: pekingme <[email protected]>
PiperOrigin-RevId: 289676795

Author: zkovar

catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java

@@ -95,6 +95,7 @@ public View onCreateDemoView(
     final RadioGroup title = root.findViewById(R.id.cat_picker_title_group);
     final RadioGroup opening = root.findViewById(R.id.cat_picker_opening_month_group);
     final RadioGroup selection = root.findViewById(R.id.cat_picker_selection_group);
+    final RadioGroup inputMode = root.findViewById(R.id.cat_picker_input_mode_group);
 
     launcher.setOnClickListener(
         v -> {
@@ -106,9 +107,10 @@ public View onCreateDemoView(
           int titleChoice = title.getCheckedRadioButtonId();
           int openingChoice = opening.getCheckedRadioButtonId();
           int selectionChoice = selection.getCheckedRadioButtonId();
+          int inputModeChoices = inputMode.getCheckedRadioButtonId();
 
           MaterialDatePicker.Builder<?> builder =
-              setupDateSelectorBuilder(selectionModeChoice, selectionChoice);
+              setupDateSelectorBuilder(selectionModeChoice, selectionChoice, inputModeChoices);
           CalendarConstraints.Builder constraintsBuilder =
               setupConstraintsBuilder(boundsChoice, openingChoice, validationChoice);
 
@@ -137,14 +139,19 @@ public View onCreateDemoView(
   }
 
   private MaterialDatePicker.Builder<?> setupDateSelectorBuilder(
-      int selectionModeChoice, int selectionChoice) {
+      int selectionModeChoice, int selectionChoice, int inputModeChoice) {
     if (selectionModeChoice == R.id.cat_picker_date_selector_single) {
       MaterialDatePicker.Builder<Long> builder = MaterialDatePicker.Builder.datePicker();
       if (selectionChoice == R.id.cat_picker_selection_today) {
         builder.setSelection(today);
       } else if (selectionChoice == R.id.cat_picker_selection_next_month) {
         builder.setSelection(nextMonth);
       }
+
+      builder.setInputMode(
+          inputModeChoice == R.id.cat_picker_input_mode_calendar
+              ? MaterialDatePicker.INPUT_MODE_CALENDAR
+              : MaterialDatePicker.INPUT_MODE_TEXT);
       return builder;
     } else {
       MaterialDatePicker.Builder<Pair<Long, Long>> builder =
@@ -154,6 +161,10 @@ private MaterialDatePicker.Builder<?> setupDateSelectorBuilder(
       } else if (selectionChoice == R.id.cat_picker_selection_next_month) {
         builder.setSelection(nextMonthPair);
       }
+      builder.setInputMode(
+          inputModeChoice == R.id.cat_picker_input_mode_text
+              ? MaterialDatePicker.INPUT_MODE_CALENDAR
+              : MaterialDatePicker.INPUT_MODE_TEXT);
       return builder;
     }
   }

catalog/java/io/material/catalog/datepicker/res/layout/cat_picker_input_mode.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/cat_picker_input_mode"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/cat_picker_demo_padding"
+    android:orientation="vertical">
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/cat_picker_input_mode"
+      android:textAppearance="?attr/textAppearanceHeadline5"/>
+  <RadioGroup
+      android:id="@+id/cat_picker_input_mode_group"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal">
+    <RadioButton
+        android:id="@+id/cat_picker_input_mode_calendar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        android:text="@string/cat_picker_input_mode_calendar"
+        android:textAppearance="?attr/textAppearanceBody1"/>
+    <RadioButton
+        android:id="@+id/cat_picker_input_mode_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/cat_picker_demo_padding"
+        android:layout_marginLeft="@dimen/cat_picker_demo_padding"
+        android:text="@string/cat_picker_input_mode_text"
+        android:textAppearance="?attr/textAppearanceBody1"/>
+
+  </RadioGroup>
+</LinearLayout>

catalog/java/io/material/catalog/datepicker/res/layout/picker_main_demo.xml

@@ -41,6 +41,7 @@
     <include layout="@layout/cat_picker_title"/>
     <include layout="@layout/cat_picker_opening_month"/>
     <include layout="@layout/cat_picker_selection"/>
+    <include layout="@layout/cat_picker_input_mode"/>
 
   </LinearLayout>
 

catalog/java/io/material/catalog/datepicker/res/values/strings.xml

@@ -91,4 +91,11 @@
   <!-- Indicates that the picker will open to next month [CHAR LIMIT=25] -->
   <string name="cat_picker_opening_month_next">Next Month</string>
 
+  <!-- Grouping label for a set of radio buttons that choose the input mode [CHAR LIMIT=50] -->
+  <string name="cat_picker_input_mode">Input Mode</string>
+  <!-- Indicates that the picker will start with calendar mode [CHAR LIMIT=25] -->
+  <string name="cat_picker_input_mode_calendar">Calendar</string>
+  <!-- Indicates that the picker will start with text input mode [CHAR LIMIT=25] -->
+  <string name="cat_picker_input_mode_text">Text Input</string>
+
 </resources>

lib/java/com/google/android/material/datepicker/MaterialDatePicker.java

@@ -18,6 +18,8 @@
 
 import com.google.android.material.R;
 
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -29,8 +31,10 @@
 import android.graphics.drawable.InsetDrawable;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Bundle;
+import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.fragment.app.DialogFragment;
@@ -50,6 +54,8 @@
 import com.google.android.material.internal.CheckableImageButton;
 import com.google.android.material.resources.MaterialAttributes;
 import com.google.android.material.shape.MaterialShapeDrawable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.LinkedHashSet;
 
 /** A {@link Dialog} with a header, {@link MaterialCalendar}, and set of actions. */
@@ -60,11 +66,24 @@ public final class MaterialDatePicker<S> extends DialogFragment {
   private static final String CALENDAR_CONSTRAINTS_KEY = "CALENDAR_CONSTRAINTS_KEY";
   private static final String TITLE_TEXT_RES_ID_KEY = "TITLE_TEXT_RES_ID_KEY";
   private static final String TITLE_TEXT_KEY = "TITLE_TEXT_KEY";
+  private static final String INPUT_MODE_KEY = "INPUT_MODE_KEY";
 
   static final Object CONFIRM_BUTTON_TAG = "CONFIRM_BUTTON_TAG";
   static final Object CANCEL_BUTTON_TAG = "CANCEL_BUTTON_TAG";
   static final Object TOGGLE_BUTTON_TAG = "TOGGLE_BUTTON_TAG";
 
+  /** Date picker will start with calendar view. */
+  public static final int INPUT_MODE_CALENDAR = 0;
+
+  /** Date picker will start with input text view. */
+  public static final int INPUT_MODE_TEXT = 1;
+
+  /** @hide */
+  @RestrictTo(LIBRARY_GROUP)
+  @IntDef(value = {INPUT_MODE_CALENDAR, INPUT_MODE_TEXT})
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface InputMode {}
+
   /** Returns the UTC milliseconds representing the first moment of today in local timezone. */
   public static long todayInUtcMilliseconds() {
     return UtcDates.getTodayCalendar().getTimeInMillis();
@@ -103,6 +122,7 @@ public String getHeaderText() {
   @StringRes private int titleTextResId;
   private CharSequence titleText;
   private boolean fullscreen;
+  @InputMode private int inputMode;
 
   private TextView headerSelectionText;
   private CheckableImageButton headerToggleButton;
@@ -118,6 +138,7 @@ static <S> MaterialDatePicker<S> newInstance(@NonNull Builder<S> options) {
     args.putParcelable(CALENDAR_CONSTRAINTS_KEY, options.calendarConstraints);
     args.putInt(TITLE_TEXT_RES_ID_KEY, options.titleTextResId);
     args.putCharSequence(TITLE_TEXT_KEY, options.titleText);
+    args.putInt(INPUT_MODE_KEY, options.inputMode);
     materialDatePickerDialogFragment.setArguments(args);
     return materialDatePickerDialogFragment;
   }
@@ -147,6 +168,7 @@ public final void onCreate(@Nullable Bundle bundle) {
     calendarConstraints = activeBundle.getParcelable(CALENDAR_CONSTRAINTS_KEY);
     titleTextResId = activeBundle.getInt(TITLE_TEXT_RES_ID_KEY);
     titleText = activeBundle.getCharSequence(TITLE_TEXT_KEY);
+    inputMode = activeBundle.getInt(INPUT_MODE_KEY);
   }
 
   private int getThemeResId(Context context) {
@@ -339,6 +361,8 @@ public void onSelectionChanged(S selection) {
   private void initHeaderToggle(Context context) {
     headerToggleButton.setTag(TOGGLE_BUTTON_TAG);
     headerToggleButton.setImageDrawable(createHeaderToggleDrawable(context));
+    headerToggleButton.setChecked(inputMode != INPUT_MODE_CALENDAR);
+
     // By default, CheckableImageButton adds a delegate that reads checked state.
     // This information is not useful; we remove the delegate and use custom content descriptions.
     ViewCompat.setAccessibilityDelegate(headerToggleButton, null);
@@ -504,6 +528,7 @@ public static final class Builder<S> {
     int titleTextResId = 0;
     CharSequence titleText = null;
     @Nullable S selection = null;
+    @InputMode int inputMode = INPUT_MODE_CALENDAR;
 
     private Builder(DateSelector<S> dateSelector) {
       this.dateSelector = dateSelector;
@@ -575,6 +600,13 @@ public Builder<S> setTitleText(@Nullable CharSequence charSequence) {
       return this;
     }
 
+    /** Sets the input mode to start with. */
+    @NonNull
+    public Builder<S> setInputMode(@InputMode int inputMode) {
+      this.inputMode = inputMode;
+      return this;
+    }
+
     /** Creates a {@link MaterialDatePicker} with the provided options. */
     @NonNull
     public MaterialDatePicker<S> build() {