Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Output Switcher] Cancel setting color filter for device icon"

Browse Source
This commit is contained in:
Shaowei Shen
2021-12-05 15:01:41 +00:00
committed by Android (Google) Code Review
parent 35cac1576c 46466b9600
commit 53f3641068
4 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java
View File

@@ -18,7 +18,6 @@ package com.android.settingslib.media;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.media.MediaRoute2Info;
import android.media.MediaRouter2Manager;
@@ -57,12 +56,7 @@ public class BluetoothMediaDevice extends MediaDevice {
@Override
public Drawable getIcon() {
final Drawable drawable =
BluetoothUtils.getBtDrawableWithDescription(mContext, mCachedDevice).first;
if (!(drawable instanceof BitmapDrawable)) {
setColorFilter(drawable);
}
return drawable;
return BluetoothUtils.getBtDrawableWithDescription(mContext, mCachedDevice).first;
}
@Override

4
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java
View File

@@ -58,9 +58,7 @@ public class InfoMediaDevice extends MediaDevice {
@Override
public Drawable getIcon() {
final Drawable drawable = getIconWithoutBackground();
setColorFilter(drawable);
return drawable;
return getIconWithoutBackground();
}
@Override

15
packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java
View File

@@ -15,6 +15,7 @@
*/
package com.android.settingslib.media;
import static android.media.MediaRoute2Info.TYPE_BLE_HEADSET;
import static android.media.MediaRoute2Info.TYPE_BLUETOOTH_A2DP;
import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER;
import static android.media.MediaRoute2Info.TYPE_DOCK;
@@ -29,12 +30,8 @@ import static android.media.MediaRoute2Info.TYPE_USB_DEVICE;
import static android.media.MediaRoute2Info.TYPE_USB_HEADSET;
import static android.media.MediaRoute2Info.TYPE_WIRED_HEADPHONES;
import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;
import static android.media.MediaRoute2Info.TYPE_BLE_HEADSET;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.media.MediaRoute2Info;
import android.media.MediaRouter2Manager;
@@ -44,8 +41,6 @@ import android.util.Log;
import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import com.android.settingslib.R;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -141,14 +136,6 @@ public abstract class MediaDevice implements Comparable<MediaDevice> {
getId());
}
void setColorFilter(Drawable drawable) {
final ColorStateList list =
mContext.getResources().getColorStateList(
R.color.advanced_icon_color, mContext.getTheme());
drawable.setColorFilter(new PorterDuffColorFilter(list.getDefaultColor(),
PorterDuff.Mode.SRC_IN));
}
/**
* Get name from MediaDevice.
*

4
packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java
View File

@@ -84,9 +84,7 @@ public class PhoneMediaDevice extends MediaDevice {
@Override
public Drawable getIcon() {
final Drawable drawable = getIconWithoutBackground();
setColorFilter(drawable);
return drawable;
return getIconWithoutBackground();
}
@Override