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

Commit 8028f74c authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Update connection summary for bonding loss" into main

parents 4dfc42d4 ca127397

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -1510,6 +1510,9 @@ 
    <!-- Warning message to tell user is have problem during profile connect, it need to turn off device and back on. [CHAR_LIMIT=NONE] -->

    <!-- Warning message to tell user is have problem during profile connect, it need to turn off device and back on. [CHAR_LIMIT=NONE] -->

    <string name="profile_connect_timeout_subtext">Problem connecting. Turn device off &amp; back on</string>

    <string name="profile_connect_timeout_subtext">Problem connecting. Turn device off &amp; back on</string>





    <!-- Warning message when the bluetooth key is missing. [CHAR_LIMIT=NONE] -->

    <string name="bluetooth_key_missing_subtext">Can’t connect</string>



    <!-- Name of the 3.5mm audio device. [CHAR LIMIT=40] -->

    <!-- Name of the 3.5mm audio device. [CHAR LIMIT=40] -->

    <string name="media_transfer_wired_device_name">Wired audio device</string>

    <string name="media_transfer_wired_device_name">Wired audio device</string>

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -1495,6 +1495,11 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        int leftBattery = -1;

        int leftBattery = -1;

        int rightBattery = -1;

        int rightBattery = -1;





        Integer keyMissingCount = BluetoothUtils.getKeyMissingCount(mDevice);

        if (keyMissingCount != null && keyMissingCount > 0) {

            return mContext.getString(R.string.bluetooth_key_missing_subtext);

        }



        if (isProfileConnectedFail() && isConnected()) {

        if (isProfileConnectedFail() && isConnected()) {

            return mContext.getString(R.string.profile_connect_timeout_subtext);

            return mContext.getString(R.string.profile_connect_timeout_subtext);

        }

        }