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

Commit 2c6a016b authored by jackqdyulei's avatar jackqdyulei
Browse files

Update the bluetooth battery icon 

In ag/2863892, we add a new parameter to tune the size of battery icon.
This cl use this parameter and update the icon in bluetooth detail page.

Bug: 65397557
Test: RunSettingsLibRoboTests & Screenshots
Change-Id: I6dd26f14b3209101dd39320b3720fbd4f79acf54
parent 6361c9d8

src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java

+3 −2
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController 
    }



    protected void setHeaderProperties() {

        final Pair<Drawable, String> pair = Utils.getBtClassDrawableWithDescription

                (mContext, mCachedDevice);

        final Pair<Drawable, String> pair = Utils.getBtClassDrawableWithDescription(

                mContext, mCachedDevice,

                mContext.getResources().getFraction(R.fraction.bt_battery_scale_fraction, 1, 1));

        String summaryText = mCachedDevice.getConnectionSummary();

        mHeaderController.setLabel(mCachedDevice.getName());

        mHeaderController.setIcon(pair.first);

src/com/android/settings/bluetooth/Utils.java

+22 −10
Original line number Diff line number Diff line
@@ -156,28 +156,36 @@ public final class Utils { 


    static Pair<Drawable, String> getBtClassDrawableWithDescription(Context context,

            CachedBluetoothDevice cachedDevice) {

        return getBtClassDrawableWithDescription(context, cachedDevice, 1 /* iconScale */);

    }



    static Pair<Drawable, String> getBtClassDrawableWithDescription(Context context,

            CachedBluetoothDevice cachedDevice, float iconScale) {

        BluetoothClass btClass = cachedDevice.getBtClass();

        final int level = cachedDevice.getBatteryLevel();

        if (btClass != null) {

            switch (btClass.getMajorDeviceClass()) {

                case BluetoothClass.Device.Major.COMPUTER:

                    return new Pair<>(getBluetoothDrawable(context, R.drawable.ic_bt_laptop, level),

                    return new Pair<>(getBluetoothDrawable(context, R.drawable.ic_bt_laptop, level,

                            iconScale),

                            context.getString(R.string.bluetooth_talkback_computer));



                case BluetoothClass.Device.Major.PHONE:

                    return new Pair<>(

                            getBluetoothDrawable(context, R.drawable.ic_bt_cellphone, level),

                            getBluetoothDrawable(context, R.drawable.ic_bt_cellphone, level,

                                    iconScale),

                            context.getString(R.string.bluetooth_talkback_phone));



                case BluetoothClass.Device.Major.PERIPHERAL:

                    return new Pair<>(

                            getBluetoothDrawable(context, HidProfile.getHidClassDrawable(btClass),

                                    level),

                                    level, iconScale),

                            context.getString(R.string.bluetooth_talkback_input_peripheral));



                case BluetoothClass.Device.Major.IMAGING:

                    return new Pair<>(

                            getBluetoothDrawable(context, R.drawable.ic_settings_print, level),

                            getBluetoothDrawable(context, R.drawable.ic_settings_print, level,

                                    iconScale),

                            context.getString(R.string.bluetooth_talkback_imaging));



                default:
@@ -189,30 +197,34 @@ public final class Utils { 
        for (LocalBluetoothProfile profile : profiles) {

            int resId = profile.getDrawableResource(btClass);

            if (resId != 0) {

                return new Pair<>(getBluetoothDrawable(context, resId, level), null);

                return new Pair<>(getBluetoothDrawable(context, resId, level, iconScale), null);

            }

        }

        if (btClass != null) {

            if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {

                return new Pair<>(

                        getBluetoothDrawable(context, R.drawable.ic_bt_headset_hfp, level),

                        getBluetoothDrawable(context, R.drawable.ic_bt_headset_hfp, level,

                                iconScale),

                        context.getString(R.string.bluetooth_talkback_headset));

            }

            if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {

                return new Pair<>(

                        getBluetoothDrawable(context, R.drawable.ic_bt_headphones_a2dp, level),

                        getBluetoothDrawable(context, R.drawable.ic_bt_headphones_a2dp, level,

                                iconScale),

                        context.getString(R.string.bluetooth_talkback_headphone));

            }

        }

        return new Pair<>(getBluetoothDrawable(context, R.drawable.ic_settings_bluetooth, level),

        return new Pair<>(

                getBluetoothDrawable(context, R.drawable.ic_settings_bluetooth, level, iconScale),

                context.getString(R.string.bluetooth_talkback_bluetooth));

    }



    @VisibleForTesting

    static Drawable getBluetoothDrawable(Context context, @DrawableRes int resId,

            int batteryLevel) {

            int batteryLevel, float iconScale) {

        if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

            return BluetoothDeviceLayerDrawable.createLayerDrawable(context, resId, batteryLevel);

            return BluetoothDeviceLayerDrawable.createLayerDrawable(context, resId, batteryLevel,

                    iconScale);

        } else if (resId != 0) {

            return context.getDrawable(resId);

        } else {

tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class UtilsTest { 
    @Test

    public void testGetBluetoothDrawable_noBatteryLevel_returnSimpleDrawable() {

        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,

                R.drawable.ic_bt_laptop, BluetoothDevice.BATTERY_LEVEL_UNKNOWN);

                R.drawable.ic_bt_laptop, BluetoothDevice.BATTERY_LEVEL_UNKNOWN, 1 /* iconScale */);



        assertThat(drawable).isNotInstanceOf(BluetoothDeviceLayerDrawable.class);

    }
@@ -88,7 +88,7 @@ public class UtilsTest { 
    @Test

    public void testGetBluetoothDrawable_hasBatteryLevel_returnLayerDrawable() {

        final Drawable drawable = Utils.getBluetoothDrawable(RuntimeEnvironment.application,

                R.drawable.ic_bt_laptop, 10 /* batteryLevel */);

                R.drawable.ic_bt_laptop, 10 /* batteryLevel */, 1 /* iconScale */);



        assertThat(drawable).isInstanceOf(BluetoothDeviceLayerDrawable.class);

    }