Merge "Update data_usage_bytes_editor spinner background" into tm-dev

res/drawable/data_bytes_editor_spinner_background.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2022 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.
+  -->
+
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/settingslib_ripple_color">
+
+    <item android:id="@android:id/background">
+        <layer-list android:paddingMode="stack"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="48dp"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp">
+            <item>
+                <shape>
+                    <corners android:radius="28dp"/>
+                    <solid android:color="@android:color/system_accent1_100"/>
+                    <size android:height="@dimen/settingslib_spinner_height"/>
+                </shape>
+            </item>
+
+            <item
+                android:gravity="center|end"
+                android:width="18dp"
+                android:height="18dp"
+                android:end="12dp"
+                android:drawable="@drawable/settingslib_arrow_drop_down"/>
+        </layer-list>
+    </item>
+</ripple>

res/layout/data_usage_bytes_editor.xml

@@ -39,6 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
-        android:entries="@array/bytes_picker_sizes" />
+        android:entries="@array/bytes_picker_sizes"
+        style="@style/DataByteEditorSpinner"/>
 
 </LinearLayout>

res/values/styles.xml

@@ -948,4 +948,9 @@
         <item name="rippleColor">?android:attr/colorControlHighlight</item>
         <item name="contentPadding">@dimen/dream_item_content_padding</item>
     </style>
+
+    <style name="DataByteEditorSpinner" parent="@style/Spinner.SettingsLib">
+        <item name="android:background">@drawable/data_bytes_editor_spinner_background</item>
+        <item name="android:dropDownVerticalOffset">36dp</item>
+    </style>
 </resources>