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

Commit 4a6ccaee authored by Angela Wang's avatar Angela Wang Committed by Android (Google) Code Review
Browse files

Merge "Updates method visibility and add new string for new hearing device pairing page" into main

parents 88d99722 b1e0f283

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -338,6 +338,9 @@ 
    <!-- Message for telling the user the kind of BT device being displayed in list. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5165842622743212268] -->

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

    <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=26580326066627664] -->

    <string name="bluetooth_talkback_hearing_aids">Hearing Aids</string>



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

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

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

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,8 @@ public class BluetoothUtils { 
                // The device should show hearing aid icon if it contains any hearing aid related

                // The device should show hearing aid icon if it contains any hearing aid related

                // profiles

                // profiles

                if (profile instanceof HearingAidProfile || profile instanceof HapClientProfile) {

                if (profile instanceof HearingAidProfile || profile instanceof HapClientProfile) {

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

                    return new Pair<>(getBluetoothDrawable(context, profileResId),

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

                }

                }

                if (resId == 0) {

                if (resId == 0) {

                    resId = profileResId;

                    resId = profileResId;

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -410,10 +410,14 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        connectDevice();

        connectDevice();

    }

    }





    void setHearingAidInfo(HearingAidInfo hearingAidInfo) {

    public void setHearingAidInfo(HearingAidInfo hearingAidInfo) {

        mHearingAidInfo = hearingAidInfo;

        mHearingAidInfo = hearingAidInfo;

    }

    }





    public HearingAidInfo getHearingAidInfo() {

        return mHearingAidInfo;

    }



    /**

    /**

     * @return {@code true} if {@code cachedBluetoothDevice} is hearing aid device

     * @return {@code true} if {@code cachedBluetoothDevice} is hearing aid device

     */

     */