From 963f1a0051e49ffc496258c6bfb6e1bd5ebf9944 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Thu, 28 Apr 2022 12:37:59 +0000
Subject: [PATCH] Revert "Update data_usage_bytes_editor spinner background"

This reverts commit 18f8850521bb7b4b28ab381c53a39b4269c18f2f.

Reason for revert: the sysmptom fixed in SettingsSpinner side now.

Test: visual verify on the latest build
Change-Id: I683172a72597deaeb40b8facb6bd0a6cce2b9231
---
 .../data_bytes_editor_spinner_background.xml  | 44 -------------------
 res/layout/data_usage_bytes_editor.xml        |  3 +-
 res/values/styles.xml                         |  5 ---
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 res/drawable/data_bytes_editor_spinner_background.xml

diff --git a/res/drawable/data_bytes_editor_spinner_background.xml b/res/drawable/data_bytes_editor_spinner_background.xml
deleted file mode 100644
index 19cfc45bfe6..00000000000
--- a/res/drawable/data_bytes_editor_spinner_background.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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>
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index 23778d90624..a72352dbf45 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -39,7 +39,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
-        android:entries="@array/bytes_picker_sizes"
-        style="@style/DataByteEditorSpinner"/>
+        android:entries="@array/bytes_picker_sizes" />
 
 </LinearLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e2a8423cd12..7a879931a00 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -952,11 +952,6 @@
         <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>
-
     <style name="BroadcastActionButton" parent="@android:style/Widget.Material.Button">
         <item name="android:background">@drawable/broadcast_button_outline</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>