PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set accent color to COLOR_NOT_TINTED

Browse Source 
Bug: 128570540
Test: Test: make -j42 RunSettingsRoboTests
Change-Id: I483542156bf6cd24ed7080fed45e9f8e4d87a079
This commit is contained in:
hughchen
2019-03-14 17:07:47 +08:00
parent dee673b0d7
commit 43fcc7b829
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/media/MediaOutputSlice.java
View File

@@ -18,11 +18,11 @@ package com.android.settings.media;
import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI;
import android.annotation.ColorInt;
import android.app.PendingIntent;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
@@ -82,10 +82,9 @@ public class MediaOutputSlice implements CustomSliceable {
}
final List<MediaDevice> devices = getMediaDevices();
@ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
final MediaDevice connectedDevice = getWorker().getCurrentConnectedMediaDevice();
final ListBuilder listBuilder = buildActiveDeviceHeader(color, connectedDevice);
final ListBuilder listBuilder = buildActiveDeviceHeader(connectedDevice);
for (MediaDevice device : devices) {
if (!TextUtils.equals(connectedDevice.getId(), device.getId())) {
@@ -96,9 +95,9 @@ public class MediaOutputSlice implements CustomSliceable {
return listBuilder.build();
}
private ListBuilder buildActiveDeviceHeader(@ColorInt int color, MediaDevice device) {
private ListBuilder buildActiveDeviceHeader(MediaDevice device) {
final String title = device.getName();
final IconCompat icon = IconCompat.createWithResource(mContext, device.getIcon());
final IconCompat icon = getDeviceIconCompat(device);
final PendingIntent broadcastAction =
getBroadcastIntent(mContext, device.getId(), device.hashCode());
@@ -107,7 +106,7 @@ public class MediaOutputSlice implements CustomSliceable {
final ListBuilder listBuilder = new ListBuilder(mContext, MEDIA_OUTPUT_SLICE_URI,
ListBuilder.INFINITY)
.setAccentColor(color)
.setAccentColor(COLOR_NOT_TINTED)
.addRow(new ListBuilder.RowBuilder()
.setTitleItem(icon, ListBuilder.ICON_IMAGE)
.setTitle(title)
@@ -117,6 +116,17 @@ public class MediaOutputSlice implements CustomSliceable {
return listBuilder;
}
private IconCompat getDeviceIconCompat(MediaDevice device) {
Drawable drawable = device.getIcon();
if (drawable == null) {
Log.d(TAG, "getDeviceIconCompat() device : " + device.getName() + ", drawable is null");
// Use default Bluetooth device icon to handle getIcon() is null case.
drawable = mContext.getDrawable(com.android.internal.R.drawable.ic_bt_headphones_a2dp);
}
return Utils.createIconWithDrawable(drawable);
}
private MediaDeviceUpdateWorker getWorker() {
if (mWorker == null) {
mWorker = (MediaDeviceUpdateWorker) SliceBackgroundWorker.getInstance(getUri());
@@ -136,7 +146,8 @@ public class MediaOutputSlice implements CustomSliceable {
final String title = device.getName();
final PendingIntent broadcastAction =
getBroadcastIntent(mContext, device.getId(), device.hashCode());
final IconCompat deviceIcon = IconCompat.createWithResource(mContext, device.getIcon());
final IconCompat deviceIcon = getDeviceIconCompat(device);
final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
.setTitleItem(deviceIcon, ListBuilder.ICON_IMAGE)
.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,