Update BT header using BT metadata

As for unthethered headset, get BT data from BT metadata, rather than
CachedBluetoothDevice

Bug: 122460277
Test: RunSettingsRoboTests
Change-Id: Ifb5507cbbce9602726ba272c12d1bf95eff91001
This commit is contained in:
jackqdyulei
2019-01-23 13:00:13 -08:00
parent 1fc7629dda
commit 47123c8224
5 changed files with 208 additions and 11 deletions

View File

@@ -16,17 +16,20 @@
package com.android.settings.bluetooth;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.core.graphics.drawable.IconCompat;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatteryMeterView;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -37,7 +40,8 @@ import com.android.settingslib.widget.LayoutPreference;
*/
public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceController {
private LayoutPreference mLayoutPreference;
@VisibleForTesting
LayoutPreference mLayoutPreference;
private CachedBluetoothDevice mCachedDevice;
public AdvancedBluetoothDetailsHeaderController(Context context, String prefKey) {
@@ -46,8 +50,9 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
@Override
public int getAvailabilityStatus() {
//TODO(b/122460277): decide whether it is available by {@code bluetoothDevice}
return CONDITIONALLY_UNAVAILABLE;
final boolean unthetheredHeadset = Utils.getBooleanMetaData(mCachedDevice.getDevice(),
BluetoothDevice.METADATA_IS_UNTHETHERED_HEADSET);
return unthetheredHeadset ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
@@ -62,12 +67,28 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
mCachedDevice = cachedBluetoothDevice;
}
private void refresh() {
@VisibleForTesting
void refresh() {
if (mLayoutPreference != null && mCachedDevice != null) {
final TextView title = mLayoutPreference.findViewById(R.id.entity_header_title);
title.setText(mCachedDevice.getName());
final TextView summary = mLayoutPreference.findViewById(R.id.entity_header_summary);
summary.setText(mCachedDevice.getConnectionSummary());
updateSubLayout(mLayoutPreference.findViewById(R.id.layout_left),
BluetoothDevice.METADATA_UNTHETHERED_LEFT_ICON,
BluetoothDevice.METADATA_UNTHETHERED_LEFT_BATTERY,
R.string.bluetooth_left_name);
updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
BluetoothDevice.METADATA_UNTHETHERED_CASE_ICON,
BluetoothDevice.METADATA_UNTHETHERED_CASE_BATTERY,
R.string.bluetooth_middle_name);
updateSubLayout(mLayoutPreference.findViewById(R.id.layout_right),
BluetoothDevice.METADATA_UNTHETHERED_RIGHT_ICON,
BluetoothDevice.METADATA_UNTHETHERED_RIGHT_BATTERY,
R.string.bluetooth_right_name);
}
}
@@ -79,10 +100,35 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
drawable.setBatteryLevel(level);
drawable.setShowPercent(false);
drawable.setBatteryColorFilter(new PorterDuffColorFilter(
Utils.getColorAttrDefaultColor(context, android.R.attr.colorControlNormal),
com.android.settings.Utils.getColorAttrDefaultColor(context,
android.R.attr.colorControlNormal),
PorterDuff.Mode.SRC_IN));
return drawable;
}
private void updateSubLayout(LinearLayout linearLayout, int iconMetaKey, int batteryMetaKey,
int titleResId) {
if (linearLayout == null) {
return;
}
final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
final String iconUri = Utils.getStringMetaData(bluetoothDevice, iconMetaKey);
if (iconUri != null) {
final ImageView imageView = linearLayout.findViewById(R.id.header_icon);
final IconCompat iconCompat = IconCompat.createWithContentUri(iconUri);
imageView.setImageBitmap(iconCompat.getBitmap());
}
final int batteryLevel = Utils.getIntMetaData(bluetoothDevice, batteryMetaKey);
if (batteryLevel != Utils.META_INT_ERROR) {
final ImageView imageView = linearLayout.findViewById(R.id.bt_battery_icon);
imageView.setImageDrawable(createBtBatteryIcon(mContext, batteryLevel));
final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
textView.setText(com.android.settings.Utils.formatPercentage(batteryLevel));
}
final TextView textView = linearLayout.findViewById(R.id.header_title);
textView.setText(titleResId);
}
}

View File

@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import androidx.preference.PreferenceFragmentCompat;
@@ -43,6 +44,13 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle
mIsConnected = device.isConnected();
}
@Override
public boolean isAvailable() {
final boolean unthetheredHeadset = Utils.getBooleanMetaData(mCachedDevice.getDevice(),
BluetoothDevice.METADATA_IS_UNTHETHERED_HEADSET);
return !unthetheredHeadset;
}
private void onForgetButtonPressed() {
ForgetDeviceDialogFragment fragment =
ForgetDeviceDialogFragment.newInstance(mCachedDevice.getAddress());

View File

@@ -47,6 +47,8 @@ public final class Utils {
static final boolean V = BluetoothUtils.V; // verbose logging
static final boolean D = BluetoothUtils.D; // regular logging
public static final int META_INT_ERROR = -1;
private Utils() {
}
@@ -152,4 +154,29 @@ public final class Utils {
return Settings.Global.getInt(context.getContentResolver(),
Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
}
public static boolean getBooleanMetaData(BluetoothDevice bluetoothDevice, int key) {
if (bluetoothDevice == null) {
return false;
}
return Boolean.parseBoolean(bluetoothDevice.getMetadata(key));
}
public static String getStringMetaData(BluetoothDevice bluetoothDevice, int key) {
if (bluetoothDevice == null) {
return null;
}
return bluetoothDevice.getMetadata(key);
}
public static int getIntMetaData(BluetoothDevice bluetoothDevice, int key) {
if (bluetoothDevice == null) {
return META_INT_ERROR;
}
try {
return Integer.parseInt(bluetoothDevice.getMetadata(key));
} catch (NumberFormatException e) {
return META_INT_ERROR;
}
}
}