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

Merge "bt: Use group id to select color for icon"

Browse Source
This commit is contained in:
Jack He
2023-05-09 03:02:33 +00:00
committed by Gerrit Code Review
parent 9568ba7399 a674a08569
commit 3aa1e30014
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
View File

@@ -6,6 +6,7 @@ import android.annotation.SuppressLint;
import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothCsipSetCoordinator;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
@@ -162,14 +163,21 @@ public class BluetoothUtils {
resources, ((BitmapDrawable) pair.first).getBitmap()), pair.second); resources, ((BitmapDrawable) pair.first).getBitmap()), pair.second);
} }
int hashCode;
if ((cachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID)) {
hashCode = new Integer(cachedDevice.getGroupId()).hashCode();
} else {
hashCode = cachedDevice.getAddress().hashCode();
}
return new Pair<>(buildBtRainbowDrawable(context, return new Pair<>(buildBtRainbowDrawable(context,
pair.first, cachedDevice.getAddress().hashCode()), pair.second); pair.first, hashCode), pair.second);
} }
/** /**
* Build Bluetooth device icon with rainbow * Build Bluetooth device icon with rainbow
*/ */
public static Drawable buildBtRainbowDrawable(Context context, Drawable drawable, private static Drawable buildBtRainbowDrawable(Context context, Drawable drawable,
int hashCode) { int hashCode) {
final Resources resources = context.getResources(); final Resources resources = context.getResources();

3
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -1502,8 +1502,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
refresh(); refresh();
} }
return new Pair<>(BluetoothUtils.buildBtRainbowDrawable( return BluetoothUtils.getBtRainbowDrawableWithDescription(mContext, this);
mContext, pair.first, getAddress().hashCode()), pair.second);
} }
void releaseLruCache() { void releaseLruCache() {