Skip to content

Commit e37ccbb

Browse files
Material Design Teamkendrickumstattd
Material Design Team
authored andcommitted
Automated g4 rollback of changelist 721842600
PiperOrigin-RevId: 722621410
1 parent 33b1c33 commit e37ccbb

File tree

7 files changed

+4
-82
lines changed

7 files changed

+4
-82
lines changed

lib/java/com/google/android/material/color/res/color/m3_on_surface_variant_ripple_selector.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

lib/java/com/google/android/material/dialog/res/values-v23/themes_base.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

lib/java/com/google/android/material/dialog/res/values-v24/themes_base.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<style name="Base.V24.Theme.Material3.Light.Dialog" parent="Base.V23.Theme.Material3.Light.Dialog">
18+
<style name="Base.V24.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog">
1919
<item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
2020
</style>
2121

22-
<style name="Base.V24.Theme.Material3.Dark.Dialog" parent="Base.V23.Theme.Material3.Dark.Dialog">
22+
<style name="Base.V24.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog">
2323
<item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
2424
</style>
2525

lib/java/com/google/android/material/dialog/res/values/themes_base.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -603,14 +603,6 @@
603603
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>
604604
</style>
605605

606-
<style name="Base.V23.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog">
607-
<item name="colorControlHighlight">@color/m3_on_surface_variant_ripple_selector</item>
608-
</style>
609-
610-
<style name="Base.V23.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog">
611-
<item name="colorControlHighlight">@color/m3_on_surface_variant_ripple_selector</item>
612-
</style>
613-
614606
<style name="Base.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog"/>
615607
<style name="Base.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog"/>
616608

lib/java/com/google/android/material/theme/res/values-v23/themes_base.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

lib/java/com/google/android/material/theme/res/values-v24/themes_base.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<style name="Base.V24.Theme.Material3.Light" parent="Base.V23.Theme.Material3.Light">
18+
<style name="Base.V24.Theme.Material3.Light" parent="Base.V14.Theme.Material3.Light">
1919
<item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
2020
</style>
2121

22-
<style name="Base.V24.Theme.Material3.Dark" parent="Base.V23.Theme.Material3.Dark">
22+
<style name="Base.V24.Theme.Material3.Dark" parent="Base.V14.Theme.Material3.Dark">
2323
<item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
2424
</style>
2525

lib/java/com/google/android/material/theme/res/values/themes_base.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -633,14 +633,6 @@
633633
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>
634634
</style>
635635

636-
<style name="Base.V23.Theme.Material3.Light" parent="Base.V14.Theme.Material3.Light">
637-
<item name="colorControlHighlight">@color/m3_on_surface_variant_ripple_selector</item>
638-
</style>
639-
640-
<style name="Base.V23.Theme.Material3.Dark" parent="Base.V14.Theme.Material3.Dark">
641-
<item name="colorControlHighlight">@color/m3_on_surface_variant_ripple_selector</item>
642-
</style>
643-
644636
<style name="Base.Theme.Material3.Light" parent="Base.V14.Theme.Material3.Light"/>
645637
<style name="Base.Theme.Material3.Dark" parent="Base.V14.Theme.Material3.Dark"/>
646638

0 commit comments

Comments
 (0)