Commit bd302c92 authored by Theresa's avatar Theresa Committed by Commit Bot

Update popup menu and context popup menu themes

Set a popupMenuTheme and contextPopupMenuTheme on the base activity
styles, updating their backgrounds to the material 9 patch.
contextPopupMenuTheme will apply on N+.

BUG=858003

Change-Id: Iea1b5ac524f687bde73c1b4b1722c132a568ffb6
Reviewed-on: https://chromium-review.googlesource.com/c/1387843Reviewed-by: default avatarBecky Zhou <huayinz@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619497}
parent 0452174c
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
<item name="android:windowExitTransition" tools:targetApi="21">@null</item> <item name="android:windowExitTransition" tools:targetApi="21">@null</item>
<item name="android:windowSharedElementEnterTransition" tools:targetApi="21">@transition/move_image</item> <item name="android:windowSharedElementEnterTransition" tools:targetApi="21">@transition/move_image</item>
<item name="android:windowSharedElementExitTransition" tools:targetApi="21">@transition/move_image</item> <item name="android:windowSharedElementExitTransition" tools:targetApi="21">@transition/move_image</item>
<item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
<item name="android:contextPopupMenuStyle" tools:targetApi="24">@style/PopupMenuStyle</item>
</style> </style>
<style name="MainTheme" parent="MainThemeBase" /> <style name="MainTheme" parent="MainThemeBase" />
<style name="TranslucentMainTheme" parent="MainThemeBase"> <style name="TranslucentMainTheme" parent="MainThemeBase">
...@@ -74,6 +76,8 @@ ...@@ -74,6 +76,8 @@
<item name="colorControlHighlight">@color/control_highlight_color</item> <item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="spinnerStyle">@style/SpinnerStyle</item> <item name="spinnerStyle">@style/SpinnerStyle</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
<item name="android:contextPopupMenuStyle" tools:targetApi="24">@style/PopupMenuStyle</item>
</style> </style>
<style name="FullscreenWhite" parent="FullscreenWhiteBase" /> <style name="FullscreenWhite" parent="FullscreenWhiteBase" />
...@@ -144,6 +148,8 @@ ...@@ -144,6 +148,8 @@
<item name="floatLabelPaddingTop">@dimen/pref_autofill_field_top_margin</item> <item name="floatLabelPaddingTop">@dimen/pref_autofill_field_top_margin</item>
<item name="actionBarStyle">@style/PreferenceActionBarModern</item> <item name="actionBarStyle">@style/PreferenceActionBarModern</item>
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
<item name="android:contextPopupMenuStyle" tools:targetApi="24">@style/PopupMenuStyle</item>
</style> </style>
<style name="PreferenceActionBarModern" parent="@style/Widget.AppCompat.Light.ActionBar.Solid"> <style name="PreferenceActionBarModern" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
<item name="titleTextStyle">@style/BlackHeadline</item> <item name="titleTextStyle">@style/BlackHeadline</item>
...@@ -215,6 +221,8 @@ ...@@ -215,6 +221,8 @@
<item name="colorAccent">@color/pref_accent_color</item> <item name="colorAccent">@color/pref_accent_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item> <item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="spinnerStyle">@style/SpinnerStyle</item> <item name="spinnerStyle">@style/SpinnerStyle</item>
<item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
<item name="android:contextPopupMenuStyle" tools:targetApi="24">@style/PopupMenuStyle</item>
</style> </style>
<style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" /> <style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" />
...@@ -340,6 +348,13 @@ ...@@ -340,6 +348,13 @@
<item name="android:popupElevation" tools:targetApi="21">0dp</item> <item name="android:popupElevation" tools:targetApi="21">0dp</item>
</style> </style>
<!-- Popup and long-press context popup menu style -->
<style name="PopupMenuStyle" parent="Widget.AppCompat.Light.PopupMenu">
<item name="android:popupBackground">@drawable/popup_bg</item>
<item name="android:overlapAnchor" tools:targetApi="21">true</item>
<item name="android:popupElevation" tools:targetApi="21">0dp</item>
</style>
<!-- Bubble styles --> <!-- Bubble styles -->
<style name="TextBubbleAnimation"> <style name="TextBubbleAnimation">
<item name="android:windowEnterAnimation">@anim/textbubble_in</item> <item name="android:windowEnterAnimation">@anim/textbubble_in</item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment