Commit dba77bd3 authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot

Update spinner background to the new popup background 9-patch

Bug: 900755
Change-Id: I07ed1f9e3bc27ff617b0f7d0f22ec5ac9ba22608
Reviewed-on: https://chromium-review.googlesource.com/c/1337069Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608490}
parent 27a86e09
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<item name="colorControlNormal">@color/control_normal_color</item> <item name="colorControlNormal">@color/control_normal_color</item>
<item name="colorControlActivated">@color/light_active_color</item> <item name="colorControlActivated">@color/light_active_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item> <item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="spinnerStyle">@style/SpinnerStyle</item>
<!-- Navigation Transitions, requires API level 21 --> <!-- Navigation Transitions, requires API level 21 -->
<item name="android:windowAllowEnterTransitionOverlap" tools:targetApi="21">false</item> <item name="android:windowAllowEnterTransitionOverlap" tools:targetApi="21">false</item>
...@@ -71,6 +72,7 @@ ...@@ -71,6 +72,7 @@
<item name="colorPrimary">@color/light_active_color</item> <item name="colorPrimary">@color/light_active_color</item>
<item name="colorAccent">@color/light_active_color</item> <item name="colorAccent">@color/light_active_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="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
<style name="FullscreenWhite" parent="FullscreenWhiteBase" /> <style name="FullscreenWhite" parent="FullscreenWhiteBase" />
...@@ -82,6 +84,7 @@ ...@@ -82,6 +84,7 @@
<item name="android:colorBackgroundCacheHint">@null</item> <item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</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="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
...@@ -108,6 +111,7 @@ ...@@ -108,6 +111,7 @@
<item name="colorControlNormal">@color/control_normal_color</item> <item name="colorControlNormal">@color/control_normal_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item> <item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="colorPrimary">@color/light_active_color</item> <item name="colorPrimary">@color/light_active_color</item>
<item name="spinnerStyle">@style/SpinnerStyle</item>
</style> </style>
<style name="AlertDialogTitleStyle" parent="RtlOverlay.DialogWindowTitle.AppCompat"> <style name="AlertDialogTitleStyle" parent="RtlOverlay.DialogWindowTitle.AppCompat">
...@@ -224,6 +228,7 @@ ...@@ -224,6 +228,7 @@
<!-- Color of checkboxes, switches, buttons, etc. --> <!-- Color of checkboxes, switches, buttons, etc. -->
<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>
</style> </style>
<style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" /> <style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" />
...@@ -343,6 +348,12 @@ ...@@ -343,6 +348,12 @@
<item name="android:paddingEnd">4dp</item> <item name="android:paddingEnd">4dp</item>
</style> </style>
<!-- Spinner styles -->
<style name="SpinnerStyle" parent="Widget.AppCompat.Spinner">
<item name="android:popupBackground">@drawable/popup_bg</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>
...@@ -458,6 +469,7 @@ ...@@ -458,6 +469,7 @@
<item name="colorPrimaryDark">@android:color/black</item> <item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@color/light_active_color</item> <item name="colorAccent">@color/light_active_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item> <item name="colorControlHighlight">@color/control_highlight_color</item>
<item name="spinnerStyle">@style/SpinnerStyle</item>
<!-- Remove ActionBar --> <!-- Remove ActionBar -->
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
......
...@@ -101,18 +101,18 @@ ...@@ -101,18 +101,18 @@
Since ChromeActivities are not HW accelerated, they don't get fancy Since ChromeActivities are not HW accelerated, they don't get fancy
material shadows for popups. This theme sets drawable with pre-baked material shadows for popups. This theme sets drawable with pre-baked
shadows to those popups to make them look better. shadows to those popups to make them look better.
'popup_background_shadow' is a copy of 'abc_popup_background_mtrl_mult' 'popup_bg' is a 9-patch similar to 'abc_popup_background_mtrl_mult'
drawable from Android support library, where it's used to simulate drawable from Android support library, where it's used to simulate
material design on earlier Android versions. material design on earlier Android versions.
--> -->
<style name="ListPopupWindow.LowEnd" parent="android:Widget.Material.Light.ListPopupWindow"> <style name="ListPopupWindow.LowEnd" parent="android:Widget.Material.Light.ListPopupWindow">
<item name="android:popupBackground">@drawable/popup_background_shadow</item> <item name="android:popupBackground">@drawable/popup_bg</item>
</style> </style>
<style name="Spinner.LowEnd" parent="android:Widget.Material.Light.Spinner"> <style name="Spinner.LowEnd" parent="android:Widget.Material.Light.Spinner">
<item name="android:popupBackground">@drawable/popup_background_shadow</item> <item name="android:popupBackground">@drawable/popup_bg</item>
</style> </style>
<style name="AutoCompleteTextView.LowEnd" parent="android:Widget.Material.Light.AutoCompleteTextView"> <style name="AutoCompleteTextView.LowEnd" parent="android:Widget.Material.Light.AutoCompleteTextView">
<item name="android:popupBackground">@drawable/popup_background_shadow</item> <item name="android:popupBackground">@drawable/popup_bg</item>
</style> </style>
<style name="MainTheme.LowEnd" parent="MainTheme"> <style name="MainTheme.LowEnd" parent="MainTheme">
<item name="android:popupWindowStyle">@style/ListPopupWindow.LowEnd</item> <item name="android:popupWindowStyle">@style/ListPopupWindow.LowEnd</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