From 8342f9025eefe64ca24312467d021a522e833769 Mon Sep 17 00:00:00 2001 From: conradchen Date: Wed, 12 Jan 2022 16:46:55 -0500 Subject: [PATCH] [M3][Dialog] Add date and time picker themes to M3 dialog themes Also moves all theme overlays to separate files for internal building purpose. PiperOrigin-RevId: 421385265 --- .../material/dialog/res/values-v21/styles.xml | 3 - .../dialog/res/values-v21/themes_base.xml | 10 -- .../{themes.xml => themes_overlay.xml} | 16 ++- .../material/dialog/res/values/themes.xml | 66 +--------- .../dialog/res/values/themes_base.xml | 45 ++----- .../dialog/res/values/themes_overlay.xml | 113 ++++++++++++++++++ 6 files changed, 141 insertions(+), 112 deletions(-) rename lib/java/com/google/android/material/dialog/res/values-v21/{themes.xml => themes_overlay.xml} (70%) create mode 100644 lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml diff --git a/lib/java/com/google/android/material/dialog/res/values-v21/styles.xml b/lib/java/com/google/android/material/dialog/res/values-v21/styles.xml index e720cb901e0..62e5861f613 100644 --- a/lib/java/com/google/android/material/dialog/res/values-v21/styles.xml +++ b/lib/java/com/google/android/material/dialog/res/values-v21/styles.xml @@ -17,7 +17,4 @@ diff --git a/lib/java/com/google/android/material/dialog/res/values-v21/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values-v21/themes_base.xml index 230ad8d9c1a..af2fa7bf6e9 100644 --- a/lib/java/com/google/android/material/dialog/res/values-v21/themes_base.xml +++ b/lib/java/com/google/android/material/dialog/res/values-v21/themes_base.xml @@ -15,16 +15,6 @@ limitations under the License. --> - - - - - - + + + + + - + - - - - - - - - - - - - - diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml index 0e0d7dcb601..11b3d6c477c 100644 --- a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml +++ b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml @@ -208,6 +208,12 @@ @style/ThemeOverlay.Material3.Dialog.Alert @style/ThemeOverlay.Material3.MaterialAlertDialog + + @style/Widget.Material3.MaterialCalendar + @style/ThemeOverlay.Material3.MaterialCalendar.Fullscreen + @style/ThemeOverlay.Material3.MaterialCalendar + @style/ThemeOverlay.Material3.MaterialTimePicker + @style/ThemeOverlay.Material3.DynamicColors.Light @@ -401,6 +407,12 @@ @style/ThemeOverlay.Material3.Dialog.Alert @style/ThemeOverlay.Material3.MaterialAlertDialog + + @style/Widget.Material3.MaterialCalendar + @style/ThemeOverlay.Material3.MaterialCalendar.Fullscreen + @style/ThemeOverlay.Material3.MaterialCalendar + @style/ThemeOverlay.Material3.MaterialTimePicker + @style/ThemeOverlay.Material3.DynamicColors.Dark @@ -408,10 +420,6 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + +