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

Commit e7ccbf43 authored by chelseahao's avatar chelseahao Committed by Chelsea Hao
Browse files

Update audio sharing dialog text. 

Also add a radius to the qr code image.

Test: atest
Bug: 381775542
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I6b06b02f63bc46ec20b7a9e0aa236f2547a5f612
parent b6ba9c3b

res/layout-land/bluetooth_audio_streams_qr_code.xml

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 


                <ImageView

                    android:id="@+id/qrcode_view"

                    android:layout_width="@dimen/qrcode_size"

                    android:layout_height="@dimen/qrcode_size"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@string/qr_code_content_description"

                    android:focusable="true" />

res/layout/bluetooth_audio_streams_qr_code.xml

+3 −3
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ 


        <ImageView

            android:id="@+id/qrcode_view"

            android:layout_width="@dimen/qrcode_size"

            android:layout_height="@dimen/qrcode_size"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:contentDescription="@string/qr_code_content_description"

            android:focusable="true"

            android:paddingTop="70dp"/>

            android:layout_marginTop="70dp"/>



        <TextView

            android:id="@+id/password"

res/layout/dialog_custom_body_audio_sharing.xml

+9 −0
Original line number Diff line number Diff line
@@ -47,6 +47,15 @@ 
            android:paddingBottom="24dp"

            android:visibility="gone" />



        <TextView

            android:id="@+id/description_text_2"

            style="@style/DeviceAudioSharingText"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:paddingBottom="24dp"

            android:visibility="gone" />



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/device_btn_list"

            android:layout_width="match_parent"

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ 
    <dimen name="contrast_button_horizontal_spacing">16dp</dimen>



    <dimen name="audio_streams_qrcode_size">264dp</dimen>

    <dimen name="audio_streams_qrcode_margin">1.8dp</dimen>

    <dimen name="audio_streams_qrcode_preview_size">300dp</dimen>

    <dimen name="audio_streams_qrcode_preview_radius">30dp</dimen>

    <dimen name="audio_streams_qrcode_scanner_fragment_padding">16dp</dimen>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -13873,6 +13873,10 @@ 
    <string name="audio_sharing_close_button_label">Close</string>

    <!-- Content for audio sharing share dialog with no device, ask users to connect device  [CHAR LIMIT=none]-->

    <string name="audio_sharing_dialog_connect_device_content">Connect another pair of compatible headphones, or share your stream\'s name and password with the other person</string>

    <!-- Content for audio sharing share dialog with no device, ask users to scan qr code [CHAR LIMIT=none]-->

    <string name="audio_sharing_dialog_qr_code_content">Let others scan this code and listen to your audio\n\nStream name: <xliff:g example="Pixel 8" id="stream_name">%1$s</xliff:g>\nPassword: <xliff:g example="123456" id="password">%2$s</xliff:g></string>

    <!-- Content for audio sharing share dialog with no device, ask users to pair new device [CHAR LIMIT=none]-->

    <string name="audio_sharing_dialog_pair_new_device_content">or pair another set of compatible headphones</string>

    <!-- Content for audio sharing share dialog with no device, ask users to pair device  [CHAR LIMIT=none]-->

    <string name="audio_sharing_dialog_pair_device_content">Pair another set of compatible headphones, or share your audio stream QR code with the other person</string>

    <!-- Text for sharing audio sharing state [CHAR LIMIT=none]-->