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

Commit d611829c authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] Update dialog style and wording" into main

parents 22cba6ee c527b403

res/layout/dialog_custom_title_audio_sharing.xml

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


    <ImageView

        android:id="@+id/title_icon"

        android:layout_width="28dp"

        android:layout_height="28dp"

        android:layout_width="36dp"

        android:layout_height="36dp"

        android:layout_gravity="center"

        android:contentDescription="@null"

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

src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen 
                        .setTitleIcon(com.android.settingslib.R.drawable.ic_bt_le_audio_sharing)

                        .setIsCustomBodyEnabled(true)

                        .setCustomMessage(R.string.audio_sharing_comfirm_dialog_content)

                        .setPositiveButton(R.string.okay, (d, w) -> {})

                        .setPositiveButton(R.string.audio_sharing_close_button_label, (d, w) -> {})

                        .build();

        dialog.setCanceledOnTouchOutside(true);

        return dialog;

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class AudioSharingConfirmDialogFragmentTest { 
    }



    @Test

    public void onCreateDialog_clickOk_dialogDismiss() {

    public void onCreateDialog_clickClose_dialogDismiss() {

        mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);

        AudioSharingConfirmDialogFragment.show(mParent);

        shadowMainLooper().idle();