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

Commit a510dbe2 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "LeAudioTestApp: Split and present BIS, ENC, PA states" into main am:... 

Merge "LeAudioTestApp: Split and present BIS, ENC, PA states" into main am: 64b6ac66 am: 6960613e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2756395



Change-Id: I555f1f2c6e8f4596a1494cf69f140641fcb033dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebdc215c 6960613e

android/leaudio/app/src/main/java/com/android/bluetooth/leaudio/LeAudioRecycleViewAdapter.java

+305 −195

File changed.

Preview size limit exceeded, changes collapsed.

android/leaudio/app/src/main/res/layout/bass_layout.xml

+29 −5
Original line number Original line Diff line number Diff line
@@ -43,13 +43,37 @@ 
            android:gravity="center_vertical"

            android:gravity="center_vertical"

            android:text="State:" />

            android:text="State:" />





        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="5"

            android:gravity="center_vertical"

            android:orientation="vertical">



            <TextView

            <TextView

            android:id="@+id/receiver_state_text"

                android:id="@+id/receiver_pa_state_text"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

            android:layout_marginRight="10dp"

                android:layout_marginEnd="10dp"

                android:layout_weight="2"

                android:layout_weight="2"

            android:text="IDLE" />

                android:text="@string/broadcast_pa_sync_state_pa_not_sync" />



            <TextView

                android:id="@+id/receiver_enc_state_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginEnd="10dp"

                android:layout_weight="2"

                android:text="@string/broadcast_big_encryption_not_enc" />



            <TextView

                android:id="@+id/receiver_bis_state_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginEnd="10dp"

                android:layout_weight="2"

                android:text="@string/broadcast_bis_sync_state_bis_not_sync" />

        </LinearLayout>





        <ImageButton

        <ImageButton

            android:id="@+id/broadcast_button"

            android:id="@+id/broadcast_button"

android/leaudio/app/src/main/res/values/donottranslate_strings.xml

+13 −7
Original line number Original line Diff line number Diff line
@@ -80,13 +80,19 @@ 
    </string-array>

    </string-array>

    <string name="group_locked">LOCKED</string>

    <string name="group_locked">LOCKED</string>

    <string name="group_unlocked">UNLOCKED</string>

    <string name="group_unlocked">UNLOCKED</string>

    <string name="broadcast_state_idle">IDLE</string>

    <string name="broadcast_pa_sync_state_pa_not_sync">PA NOT SYNC</string>

    <string name="broadcast_state_set_source_failed">SET_SOURCE_FAILED</string>

    <string name="broadcast_pa_sync_state_syncinfo_req">SyncInfo REQ</string>

    <string name="broadcast_state_syncing">SYNCING</string>

    <string name="broadcast_pa_sync_state_pa_sync">PA SYNC</string>

    <string name="broadcast_state_sync_pa_failed">SYNC_PA_FAILED</string>

    <string name="broadcast_pa_sync_state_sync_pa_failed">SYNC PA FAILED</string>

    <string name="broadcast_state_code_required">BROADCAST_CODE_REQUIRED</string>

    <string name="broadcast_pa_sync_state_no_past">NO PAST</string>

    <string name="broadcast_state_code_invalid">BROADCAST_CODE_INVALID</string>

    <string name="broadcast_big_encryption_not_enc">NOT ENC</string>

    <string name="broadcast_state_receiving_broadcast">RECEIVING_BROADCAST</string>

    <string name="broadcast_big_encryption_code_required">CODE REQUIRED</string>

    <string name="broadcast_big_encryption_decrypting">DECRYPTING</string>

    <string name="broadcast_big_encryption_bad_code">BAD CODE</string>

    <string name="broadcast_bis_sync_state_bis_not_sync">BIS NOT SYNC</string>

    <string name="broadcast_bis_sync_state_bis_sync">BIS SYNC</string>

    <string name="broadcast_bis_sync_state_failed_to_sync">FAILED TO SYNC</string>

    <string name="broadcast_state_rfu">RFU</string>

    <string-array name="tbs_call_states">

    <string-array name="tbs_call_states">

        <item>Incoming</item>

        <item>Incoming</item>

        <item>Dialing</item>

        <item>Dialing</item>