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

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

Merge "[Output Switcher] Cancel device icon outline"

parents 6b7701d9 ac9984d8

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class BluetoothMediaDevice extends MediaDevice { 
        if (!(drawable instanceof BitmapDrawable)) {

            setColorFilter(drawable);

        }

        return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);

        return drawable;

    }



    @Override

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

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

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

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