[DatePicker] Fix time zone when custom text input format is set

Resolves #3338 GIT_ORIGIN_REV_ID=bb3760f22753b10608d5bd1b342b5b063b3276bb PiperOrigin-RevId: 523792669
material-components · Apr 13, 2023 · 619d5a6 · 619d5a6
1 parent 9ffaa8d
commit 619d5a6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/lib/java/com/google/android/material/datepicker/RangeDateSelector.java b/lib/java/com/google/android/material/datepicker/RangeDateSelector.java
@@ -192,6 +192,10 @@ public int getDefaultTitleResId() {
 
   @Override
   public void setTextInputFormat(@Nullable SimpleDateFormat format) {
+    if (format != null) {
+      format = (SimpleDateFormat) UtcDates.getNormalizedFormat(format);
+    }
+
     this.textInputFormat = format;
   }
 

diff --git a/lib/java/com/google/android/material/datepicker/SingleDateSelector.java b/lib/java/com/google/android/material/datepicker/SingleDateSelector.java
@@ -96,6 +96,10 @@ public Long getSelection() {
 
   @Override
   public void setTextInputFormat(@Nullable SimpleDateFormat format) {
+    if (format != null) {
+      format = (SimpleDateFormat) UtcDates.getNormalizedFormat(format);
+    }
+
     this.textInputFormat = format;
   }
 

diff --git a/lib/java/com/google/android/material/datepicker/UtcDates.java b/lib/java/com/google/android/material/datepicker/UtcDates.java
@@ -149,13 +149,19 @@ private static DateFormat getFormat(int style, Locale locale) {
     return format;
   }
 
+  static DateFormat getNormalizedFormat(@NonNull DateFormat dateFormat) {
+    DateFormat clone = (DateFormat) dateFormat.clone();
+    clone.setTimeZone(getTimeZone());
+    return clone;
+  }
+
   static SimpleDateFormat getDefaultTextInputFormat() {
     String defaultFormatPattern =
         ((SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()))
             .toPattern()
             .replaceAll("\\s+", "");
     SimpleDateFormat format = new SimpleDateFormat(defaultFormatPattern, Locale.getDefault());
-    format.setTimeZone(UtcDates.getTimeZone());
+    format.setTimeZone(getTimeZone());
     format.setLenient(false);
     return format;
   }

diff --git a/lib/javatests/com/google/android/material/datepicker/UtcDatesTest.java b/lib/javatests/com/google/android/material/datepicker/UtcDatesTest.java
@@ -23,6 +23,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.test.core.app.ApplicationProvider;
 import java.text.SimpleDateFormat;
+import java.util.TimeZone;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,4 +84,15 @@ public void textInputHintForKorean() {
 
     assertEquals("년.월.일.", hint);
   }
+
+  @Test
+  public void normalizeTextInputFormat() {
+    SimpleDateFormat sdf = new SimpleDateFormat("M/d/y");
+    sdf.setTimeZone(TimeZone.getTimeZone("US/Pacific"));
+
+    SimpleDateFormat normalized = (SimpleDateFormat) UtcDates.getNormalizedFormat(sdf);
+
+    assertEquals(TimeZone.getTimeZone("US/Pacific"), sdf.getTimeZone());
+    assertEquals(TimeZone.getTimeZone("UTC"), normalized.getTimeZone());
+  }
 }