From 477d097f7991cc4b27f05ebdc44302cbed727cda Mon Sep 17 00:00:00 2001
From: Anthony Tripaldi <atripaldi@google.com>
Date: Thu, 25 Apr 2019 11:03:32 -0400
Subject: [PATCH] Remove custom theme added for tooltip in captions toggle
 first run show. windowIsFloating is necessary to stop drawing system bar
 backgrounds on certain devices.

Bug: 130786771
Test: manual
Change-Id: Ic095d72d5dbfad1631b46e75775b14c7a36121b6
---
 packages/SystemUI/res/layout-land/volume_dialog.xml           | 2 +-
 packages/SystemUI/res/layout/volume_dialog.xml                | 2 +-
 packages/SystemUI/res/layout/volume_dialog_row.xml            | 2 +-
 packages/SystemUI/res/values/styles.xml                       | 4 ----
 .../src/com/android/systemui/volume/VolumeDialogImpl.java     | 4 ++--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/SystemUI/res/layout-land/volume_dialog.xml b/packages/SystemUI/res/layout-land/volume_dialog.xml
index c420117073c51..5da7819c3d76b 100644
--- a/packages/SystemUI/res/layout-land/volume_dialog.xml
+++ b/packages/SystemUI/res/layout-land/volume_dialog.xml
@@ -22,7 +22,7 @@
     android:gravity="right"
     android:layout_gravity="right"
     android:background="@android:color/transparent"
-    android:theme="@style/volume_dialog_theme">
+    android:theme="@style/qs_theme">
 
     <FrameLayout
         android:id="@+id/volume_dialog"
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml
index a90b1eb471ff3..7d6547b9cd429 100644
--- a/packages/SystemUI/res/layout/volume_dialog.xml
+++ b/packages/SystemUI/res/layout/volume_dialog.xml
@@ -22,7 +22,7 @@
     android:gravity="right"
     android:layout_gravity="right"
     android:background="@android:color/transparent"
-    android:theme="@style/volume_dialog_theme">
+    android:theme="@style/qs_theme">
 
     <!-- right-aligned to be physically near volume button -->
     <LinearLayout
diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml
index b9efc5be70c1d..6128da8627a95 100644
--- a/packages/SystemUI/res/layout/volume_dialog_row.xml
+++ b/packages/SystemUI/res/layout/volume_dialog_row.xml
@@ -20,7 +20,7 @@
     android:layout_width="@dimen/volume_dialog_panel_width"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:theme="@style/volume_dialog_theme">
+    android:theme="@style/qs_theme">
 
     <LinearLayout
         android:layout_height="wrap_content"
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 9b471c9c17dcc..5244c6a9f1693 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -317,10 +317,6 @@
         <item name="android:windowIsFloating">true</item>
     </style>
 
-    <style name="volume_dialog_theme" parent="qs_theme">
-        <item name="android:windowIsFloating">false</item>
-    </style>
-
     <style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault.Light">
         <item name="android:colorAccent">@color/remote_input_accent</item>
     </style>
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 43912f9eb4f77..7b133f267d49d 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -166,7 +166,7 @@ public class VolumeDialogImpl implements VolumeDialog,
 
     public VolumeDialogImpl(Context context) {
         mContext =
-                new ContextThemeWrapper(context, com.android.systemui.R.style.volume_dialog_theme);
+                new ContextThemeWrapper(context, R.style.qs_theme);
         mController = Dependency.get(VolumeDialogController.class);
         mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
         mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
@@ -1337,7 +1337,7 @@ public class VolumeDialogImpl implements VolumeDialog,
 
     private final class CustomDialog extends Dialog implements DialogInterface {
         public CustomDialog(Context context) {
-            super(context, com.android.systemui.R.style.volume_dialog_theme);
+            super(context, R.style.qs_theme);
         }
 
         @Override