From a23557bbb7df0de5d2cd14439c8fbb89b5920efd Mon Sep 17 00:00:00 2001
From: dniz <dniz@google.com>
Date: Tue, 29 Oct 2019 15:29:56 -0400
Subject: [PATCH] Add popupMenuBackground theme attribute and combine light and
 dark Menu styles into one style that references the new attribute

PiperOrigin-RevId: 277340044
(cherry picked from commit aa7d83333e58de31ab37f0c11733cebf55d8e28e)
---
 .../dialog/res/values/themes_base.xml         |  8 ++---
 .../dialog/res/values/themes_base_bridge.xml  |  2 ++
 .../mtrl_popupmenu_background.xml             |  0
 .../mtrl_popupmenu_background_dark.xml        | 30 +++++++++++++++++++
 .../material/menu/res/values-v21/styles.xml   |  6 ++--
 .../material/menu/res/values-v23/styles.xml   | 20 ++-----------
 .../material/menu/res/values/attrs.xml        | 21 +++++++++++++
 .../material/menu/res/values/styles.xml       |  8 -----
 .../material/theme/res/values/themes_base.xml |  8 ++---
 .../theme/res/values/themes_base_bridge.xml   |  3 ++
 10 files changed, 69 insertions(+), 37 deletions(-)
 rename lib/java/com/google/android/material/menu/res/{drawable-v21 => drawable}/mtrl_popupmenu_background.xml (100%)
 create mode 100644 lib/java/com/google/android/material/menu/res/drawable/mtrl_popupmenu_background_dark.xml
 create mode 100644 lib/java/com/google/android/material/menu/res/values/attrs.xml

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 92e21953e..4d5c561ad 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
@@ -35,11 +35,11 @@
 
     <!-- Widget styles -->
     <item name="android:contextPopupMenuStyle" tools:targetApi="n">
-      @style/Widget.MaterialComponents.PopupMenu.ContextMenu.Dark
+      @style/Widget.MaterialComponents.PopupMenu.ContextMenu
     </item>
     <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Surface</item>
     <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar.Surface</item>
-    <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow.Dark</item>
+    <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
     <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
     <item name="badgeStyle">@style/Widget.MaterialComponents.Badge</item>
     <item name="borderlessButtonStyle">@style/Widget.MaterialComponents.Button.TextButton</item>
@@ -52,13 +52,13 @@
     <item name="chipStandaloneStyle">@style/Widget.MaterialComponents.Chip.Entry</item>
     <item name="extendedFloatingActionButtonStyle">@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon</item>
     <item name="floatingActionButtonStyle">@style/Widget.MaterialComponents.FloatingActionButton</item>
-    <item name="listPopupWindowStyle">@style/Widget.MaterialComponents.PopupMenu.ListPopupWindow.Dark</item>
+    <item name="listPopupWindowStyle">@style/Widget.MaterialComponents.PopupMenu.ListPopupWindow</item>
     <item name="materialButtonStyle">@style/Widget.MaterialComponents.Button</item>
     <item name="materialButtonOutlinedStyle">@style/Widget.MaterialComponents.Button.OutlinedButton</item>
     <item name="materialButtonToggleGroupStyle">@style/Widget.MaterialComponents.MaterialButtonToggleGroup</item>
     <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
     <item name="navigationViewStyle">@style/Widget.MaterialComponents.NavigationView</item>
-    <item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Dark</item>
+    <item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu</item>
     <item name="radioButtonStyle">@style/Widget.MaterialComponents.CompoundButton.RadioButton</item>
     <item name="snackbarStyle">@style/Widget.MaterialComponents.Snackbar</item>
     <item name="snackbarButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Snackbar</item>
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml
index af1b43c59..345a1b686 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml
@@ -46,6 +46,7 @@
     <item name="colorOnPrimarySurface">?attr/colorOnSurface</item>
 
     <item name="scrimBackground">@color/mtrl_scrim_color</item>
+    <item name="popupMenuBackground">@drawable/mtrl_popupmenu_background_dark</item>
 
     <!-- Type styles -->
     <item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>
@@ -94,6 +95,7 @@
     <item name="colorOnPrimarySurface">?attr/colorOnPrimary</item>
 
     <item name="scrimBackground">@color/mtrl_scrim_color</item>
+    <item name="popupMenuBackground">@drawable/mtrl_popupmenu_background</item>
 
     <!-- Type styles -->
     <item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>
diff --git a/lib/java/com/google/android/material/menu/res/drawable-v21/mtrl_popupmenu_background.xml b/lib/java/com/google/android/material/menu/res/drawable/mtrl_popupmenu_background.xml
similarity index 100%
rename from lib/java/com/google/android/material/menu/res/drawable-v21/mtrl_popupmenu_background.xml
rename to lib/java/com/google/android/material/menu/res/drawable/mtrl_popupmenu_background.xml
diff --git a/lib/java/com/google/android/material/menu/res/drawable/mtrl_popupmenu_background_dark.xml b/lib/java/com/google/android/material/menu/res/drawable/mtrl_popupmenu_background_dark.xml
new file mode 100644
index 000000000..021fe9d55
--- /dev/null
+++ b/lib/java/com/google/android/material/menu/res/drawable/mtrl_popupmenu_background_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2019 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
+
+      http://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.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <solid android:color="?attr/colorSurface"/>
+
+  <corners
+      android:bottomLeftRadius="4dp"
+      android:bottomRightRadius="4dp"
+      android:topLeftRadius="4dp"
+      android:topRightRadius="4dp"/>
+
+  <padding
+      android:bottom="8dp"
+      android:top="8dp"/>
+
+</shape>
diff --git a/lib/java/com/google/android/material/menu/res/values-v21/styles.xml b/lib/java/com/google/android/material/menu/res/values-v21/styles.xml
index efd48f213..cffbc51b6 100644
--- a/lib/java/com/google/android/material/menu/res/values-v21/styles.xml
+++ b/lib/java/com/google/android/material/menu/res/values-v21/styles.xml
@@ -18,17 +18,17 @@
 <resources>
 
   <style name="Widget.MaterialComponents.PopupMenu.Overflow" parent="Base.Widget.MaterialComponents.PopupMenu.Overflow">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background</item>
+    <item name="android:popupBackground">?attr/popupMenuBackground</item>
     <item name="android:popupElevation">8dp</item>
   </style>
 
   <style name="Widget.MaterialComponents.PopupMenu" parent="Base.Widget.MaterialComponents.PopupMenu">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background</item>
+    <item name="android:popupBackground">?attr/popupMenuBackground</item>
     <item name="android:popupElevation">8dp</item>
   </style>
 
   <style name="Base.Widget.MaterialComponents.PopupMenu.ListPopupWindow" parent="Widget.AppCompat.ListPopupWindow">
-      <item name="android:popupBackground">@drawable/mtrl_popupmenu_background</item>
+      <item name="android:popupBackground">?attr/popupMenuBackground</item>
       <item name="android:popupElevation">8dp</item>
       <item name="android:dropDownVerticalOffset">1dp</item>
     </style>
diff --git a/lib/java/com/google/android/material/menu/res/values-v23/styles.xml b/lib/java/com/google/android/material/menu/res/values-v23/styles.xml
index 1c4496a03..5ab36df40 100644
--- a/lib/java/com/google/android/material/menu/res/values-v23/styles.xml
+++ b/lib/java/com/google/android/material/menu/res/values-v23/styles.xml
@@ -17,30 +17,14 @@
 
 <resources>
 
-  <style name="Widget.MaterialComponents.PopupMenu.Overflow.Dark">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background_dark</item>
-  </style>
-
-  <style name="Widget.MaterialComponents.PopupMenu.Dark">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background_dark</item>
-  </style>
-
   <style name="Widget.MaterialComponents.PopupMenu.ListPopupWindow" parent="Base.Widget.MaterialComponents.PopupMenu.ListPopupWindow">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background</item>
+    <item name="android:popupBackground">?attr/popupMenuBackground</item>
     <item name="android:popupElevation">8dp</item>
   </style>
 
-  <style name="Widget.MaterialComponents.PopupMenu.ListPopupWindow.Dark">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background_dark</item>
-  </style>
-
   <style name="Widget.MaterialComponents.PopupMenu.ContextMenu" parent="Base.Widget.MaterialComponents.PopupMenu.ContextMenu">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background</item>
+    <item name="android:popupBackground">?attr/popupMenuBackground</item>
     <item name="android:popupElevation">8dp</item>
   </style>
 
-  <style name="Widget.MaterialComponents.PopupMenu.ContextMenu.Dark">
-    <item name="android:popupBackground">@drawable/mtrl_popupmenu_background_dark</item>
-  </style>
-
 </resources>
diff --git a/lib/java/com/google/android/material/menu/res/values/attrs.xml b/lib/java/com/google/android/material/menu/res/values/attrs.xml
new file mode 100644
index 000000000..5bd6d0a59
--- /dev/null
+++ b/lib/java/com/google/android/material/menu/res/values/attrs.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 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
+  ~
+  ~      http://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.
+-->
+<resources>
+
+  <!-- Background for PopupMenus. -->
+  <attr name="popupMenuBackground" format="reference" />
+</resources>
diff --git a/lib/java/com/google/android/material/menu/res/values/styles.xml b/lib/java/com/google/android/material/menu/res/values/styles.xml
index e54b20ff4..822c6eb8d 100644
--- a/lib/java/com/google/android/material/menu/res/values/styles.xml
+++ b/lib/java/com/google/android/material/menu/res/values/styles.xml
@@ -31,22 +31,14 @@
 
   <style name="Widget.MaterialComponents.PopupMenu" parent="Base.Widget.MaterialComponents.PopupMenu"/>
 
-  <style name="Widget.MaterialComponents.PopupMenu.Dark"/>
-
-  <style name="Widget.MaterialComponents.PopupMenu.Overflow.Dark"/>
-
   <!-- List Popup Window Menus -->
   <style name="Base.Widget.MaterialComponents.PopupMenu.ListPopupWindow" parent="Widget.AppCompat.ListPopupWindow"/>
 
   <style name="Widget.MaterialComponents.PopupMenu.ListPopupWindow" parent="Base.Widget.MaterialComponents.PopupMenu.ListPopupWindow"/>
 
-  <style name="Widget.MaterialComponents.PopupMenu.ListPopupWindow.Dark"/>
-
   <!-- Context Menus -->
   <style name="Base.Widget.MaterialComponents.PopupMenu.ContextMenu" parent="Widget.AppCompat.PopupMenu"/>
 
   <style name="Widget.MaterialComponents.PopupMenu.ContextMenu" parent="Base.Widget.MaterialComponents.PopupMenu.ContextMenu"/>
 
-  <style name="Widget.MaterialComponents.PopupMenu.ContextMenu.Dark"/>
-
 </resources>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
index 213596a84..30c52af12 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -35,11 +35,11 @@
 
     <!-- Widget styles -->
     <item name="android:contextPopupMenuStyle" tools:targetApi="n">
-      @style/Widget.MaterialComponents.PopupMenu.ContextMenu.Dark
+      @style/Widget.MaterialComponents.PopupMenu.ContextMenu
     </item>
     <item name="actionBarStyle">@style/Widget.MaterialComponents.ActionBar.Surface</item>
     <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar.Surface</item>
-    <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow.Dark</item>
+    <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
     <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
     <item name="badgeStyle">@style/Widget.MaterialComponents.Badge</item>
     <item name="borderlessButtonStyle">@style/Widget.MaterialComponents.Button.TextButton</item>
@@ -51,13 +51,13 @@
     <item name="chipStandaloneStyle">@style/Widget.MaterialComponents.Chip.Entry</item>
     <item name="extendedFloatingActionButtonStyle">@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon</item>
     <item name="floatingActionButtonStyle">@style/Widget.MaterialComponents.FloatingActionButton</item>
-    <item name="listPopupWindowStyle">@style/Widget.MaterialComponents.PopupMenu.ListPopupWindow.Dark</item>
+    <item name="listPopupWindowStyle">@style/Widget.MaterialComponents.PopupMenu.ListPopupWindow</item>
     <item name="materialButtonStyle">@style/Widget.MaterialComponents.Button</item>
     <item name="materialButtonOutlinedStyle">@style/Widget.MaterialComponents.Button.OutlinedButton</item>
     <item name="materialButtonToggleGroupStyle">@style/Widget.MaterialComponents.MaterialButtonToggleGroup</item>
     <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
     <item name="navigationViewStyle">@style/Widget.MaterialComponents.NavigationView</item>
-    <item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Dark</item>
+    <item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu</item>
     <item name="radioButtonStyle">@style/Widget.MaterialComponents.CompoundButton.RadioButton</item>
     <item name="snackbarStyle">@style/Widget.MaterialComponents.Snackbar</item>
     <item name="snackbarButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Snackbar</item>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml b/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml
index 29d97b97c..244af2c7e 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml
@@ -46,6 +46,7 @@
     <item name="colorOnPrimarySurface">?attr/colorOnSurface</item>
 
     <item name="scrimBackground">@color/mtrl_scrim_color</item>
+    <item name="popupMenuBackground">@drawable/mtrl_popupmenu_background_dark</item>
 
     <!-- Type styles -->
     <item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>
@@ -94,6 +95,7 @@
     <item name="colorOnPrimarySurface">?attr/colorOnPrimary</item>
 
     <item name="scrimBackground">@color/mtrl_scrim_color</item>
+    <item name="popupMenuBackground">@drawable/mtrl_popupmenu_background</item>
 
     <!-- Type styles -->
     <item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>
@@ -142,6 +144,7 @@
     <item name="colorOnPrimarySurface">?attr/colorOnPrimary</item>
 
     <item name="scrimBackground">@color/mtrl_scrim_color</item>
+    <item name="popupMenuBackground">@drawable/mtrl_popupmenu_background</item>
 
     <!-- Type styles -->
     <item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>