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

Commit c9d6a17f authored by jackqdyulei's avatar jackqdyulei
Browse files

Move the bluetooth icon logic to settingslib 

This cl contains the moving about:
1. Several methods in Bluetooth/Utils.java
2. Bluetooth icon drawables
3. Bluetooth strings
4. Tests

After this cl, in quick settings detail page we could display
specific bluetooth icon(i.e. laptop, phone) with battery level.

Bug: 65488978
Test: RunSettingslibRoboTests

Change-Id: I92d2780825a986e40404dd4651e45914ca9a09eb
parent 080b8a51

packages/SettingsLib/res/drawable/ic_bt_laptop.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M20,18c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2H4c-1.1,0

            -2,0.9 -2,2v10c0,1.1 0.9,2 2,2H0v2h24v-2h-4zM4,6h16v10H4V6z"/>

</vector>
 
 No newline at end of file

packages/SettingsLib/res/drawable/ic_settings_bluetooth.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M13.5,12l3.8,-3.7c0.4,-0.4 0.4,-1.1 0,-1.5l-4.5,-4.5c-0.4,-0.4 -1.1,-0.4 -1.5,0.1C11.1,2.5 11,2.8 11,3v6.4L6.9,5.4C6.5,5 5.9,5 5.5,5.4s-0.4,1.1 0,1.5l5.1,5.1l-5.1,5.1c-0.4,0.4 -0.4,1.1 0,1.5s1.1,0.4 1.5,0l4.1,-4V21c0,0.6 0.5,1 1,1c0.3,0 0.5,-0.1 0.7,-0.3l0.1,0l4.5,-4.5c0.4,-0.4 0.4,-1.1 0,-1.5L13.5,12zM13,9.7V5.4l2.1,2.2L13,9.7zM13,18.6v-4.3l2.1,2.2L13,18.6z"/>

</vector>

packages/SettingsLib/res/drawable/ic_settings_print.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19,8H5c-1.66,0-3,1.34-3,3v5c0,0.55,0.45,1,1,1h3v3c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1v-3h3c0.55,0,1-0.45,1-1v-5

C22,9.34,20.66,8,19,8z M16,19H8v-5h8V19z

M19,12c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S19.55,12,19,12z M17,3H7

C6.45,3,6,3.45,6,4v3h12V4C18,3.45,17.55,3,17,3z"/>

</vector>

packages/SettingsLib/res/values/strings.xml

+21 −0
Original line number Diff line number Diff line
@@ -235,6 +235,27 @@ 
    <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->

    <string name="bluetooth_pairing_rejected_error_message">Pairing rejected by <xliff:g id="device_name">%1$s</xliff:g>.</string>



    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=4875089335641234463] -->

    <string name="bluetooth_talkback_computer">Computer</string>



    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5140152177885220949] -->

    <string name="bluetooth_talkback_headset">Headset</string>



    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=4260255181240622896] -->

    <string name="bluetooth_talkback_phone">Phone</string>



    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=551146170554589119] -->

    <string name="bluetooth_talkback_imaging">Imaging</string>



    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=26580326066627664] -->

    <string name="bluetooth_talkback_headphone">Headphone</string>



    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5165842622743212268] -->

    <string name="bluetooth_talkback_input_peripheral">Input Peripheral</string>



    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5615463912185280812] -->

    <string name="bluetooth_talkback_bluetooth">Bluetooth</string>



    <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_wifi_off">Wifi off.</string>

    <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

packages/SettingsLib/src/com/android/settingslib/bluetooth/Utils.java

+82 −0
Original line number Diff line number Diff line 
package com.android.settingslib.bluetooth;



import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.support.annotation.DrawableRes;

import android.util.Pair;



import com.android.settingslib.R;

import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;



import java.util.List;



public class Utils {

    public static final boolean V = false; // verbose logging
@@ -40,4 +48,78 @@ public class Utils { 
        void onShowError(Context context, String name, int messageResId);

    }



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

            CachedBluetoothDevice cachedDevice) {

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

    }



    public 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,

                            iconScale),

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



                case BluetoothClass.Device.Major.PHONE:

                    return new Pair<>(

                            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, 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,

                                    iconScale),

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



                default:

                    // unrecognized device class; continue

            }

        }



        List<LocalBluetoothProfile> profiles = cachedDevice.getProfiles();

        for (LocalBluetoothProfile profile : profiles) {

            int resId = profile.getDrawableResource(btClass);

            if (resId != 0) {

                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,

                                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,

                                iconScale),

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

            }

        }

        return new Pair<>(

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

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

    }



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

            int batteryLevel, float iconScale) {

        if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

            return BluetoothDeviceLayerDrawable.createLayerDrawable(context, resId, batteryLevel,

                    iconScale);

        } else {

            return context.getDrawable(resId);

        }

    }

}