From ac9984d89134459347e532a48edf88fdf30fdc66 Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Tue, 9 Nov 2021 08:14:18 +0000
Subject: [PATCH] [Output Switcher] Cancel device icon outline

Bug: 203071939
Test: test on device
Change-Id: Icc7297a5d1f30ad22d4434c515f345794e70aedc
---
 .../com/android/settingslib/media/BluetoothMediaDevice.java    | 2 +-
 .../src/com/android/settingslib/media/InfoMediaDevice.java     | 3 +--
 .../src/com/android/settingslib/media/PhoneMediaDevice.java    | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
index 9d4669a5a37dc..cd5c78d19c8cf 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
@@ -62,7 +62,7 @@ public class BluetoothMediaDevice extends MediaDevice {
         if (!(drawable instanceof BitmapDrawable)) {
             setColorFilter(drawable);
         }
-        return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
+        return drawable;
     }
 
     @Override
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
index 949b2456042cd..c34f65cfdbf6c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
@@ -29,7 +29,6 @@ import android.media.MediaRouter2Manager;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settingslib.R;
-import com.android.settingslib.bluetooth.BluetoothUtils;
 
 import java.util.List;
 
@@ -61,7 +60,7 @@ public class InfoMediaDevice extends MediaDevice {
     public Drawable getIcon() {
         final Drawable drawable = getIconWithoutBackground();
         setColorFilter(drawable);
-        return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
+        return drawable;
     }
 
     @Override
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
index b6c0b30b3bd4d..1139d33d440dc 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
@@ -32,7 +32,6 @@ import android.media.MediaRouter2Manager;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settingslib.R;
-import com.android.settingslib.bluetooth.BluetoothUtils;
 
 /**
  * PhoneMediaDevice extends MediaDevice to represents Phone device.
@@ -87,7 +86,7 @@ public class PhoneMediaDevice extends MediaDevice {
     public Drawable getIcon() {
         final Drawable drawable = getIconWithoutBackground();
         setColorFilter(drawable);
-        return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
+        return drawable;
     }
 
     @Override