Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53f36410 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

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

parents 35cac157 46466b96

packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java

+1 −7
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java

+1 −3
Original line number Diff line number Diff line
@@ -58,9 +58,7 @@ public class InfoMediaDevice extends MediaDevice { 


    @Override

    public Drawable getIcon() {

        final Drawable drawable = getIconWithoutBackground();

        setColorFilter(drawable);

        return drawable;

        return getIconWithoutBackground();

    }



    @Override

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

+1 −14
Original line number Diff line number Diff line
@@ -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.

     *

packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java

+1 −3
Original line number Diff line number Diff line
@@ -84,9 +84,7 @@ public class PhoneMediaDevice extends MediaDevice { 


    @Override

    public Drawable getIcon() {

        final Drawable drawable = getIconWithoutBackground();

        setColorFilter(drawable);

        return drawable;

        return getIconWithoutBackground();

    }



    @Override