From fb67b52119787195cf7b1775c9069e64dede6053 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Thu, 21 May 2020 09:53:26 -0400
Subject: [PATCH] Controls UI - Fix dropdown layer list

Remove bottom layer, not needed in this case. This will prevent the
icon from hovering over the window and not obeying animations.

Fixes: 156662716
Fixes: 156924481
Test: manual. show/hide power menu, and scroll it up
Change-Id: If7c66e68ad582143d2ecd29e0c5938070996a9f9
---
 .../SystemUI/res/drawable/control_spinner_background.xml     | 5 -----
 .../android/systemui/controls/ui/ControlsUiControllerImpl.kt | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/SystemUI/res/drawable/control_spinner_background.xml b/packages/SystemUI/res/drawable/control_spinner_background.xml
index 7a8728d2983cf..46a9dad29fecf 100644
--- a/packages/SystemUI/res/drawable/control_spinner_background.xml
+++ b/packages/SystemUI/res/drawable/control_spinner_background.xml
@@ -20,11 +20,6 @@
             android:paddingEnd="40dp"
             android:paddingLeft="0dp"
             android:paddingRight="0dp">
-    <item
-        android:gravity="end|fill_vertical"
-        android:width="40dp"
-        android:drawable="@*android:drawable/control_background_40dp_material" />
-
     <item
         android:drawable="@drawable/ic_ksh_key_down"
         android:gravity="end|bottom"
diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
index 3aa417ab904bd..7662eb58b104b 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
@@ -368,7 +368,7 @@ class ControlsUiControllerImpl @Inject constructor (
         val spinner = parent.requireViewById<TextView>(R.id.app_or_structure_spinner).apply {
             setText(selectionItem.getTitle())
             // override the default color on the dropdown drawable
-            (getBackground() as LayerDrawable).getDrawable(1)
+            (getBackground() as LayerDrawable).getDrawable(0)
                 .setTint(context.resources.getColor(R.color.control_spinner_dropdown, null))
         }