From c527b40370ad240dbb7843c7425c3ab03d5d3a05 Mon Sep 17 00:00:00 2001 From: Yiyi Shen Date: Wed, 20 Nov 2024 16:44:39 +0800 Subject: [PATCH] [Audiosharing] Update dialog style and wording Test: manual Bug: 379612304 Flag: com.android.settingslib.flags.enable_le_audio_sharing Change-Id: Ibcde412670693b13d995cdd18193cb0b79a9b52d --- res/layout/dialog_custom_title_audio_sharing.xml | 4 ++-- .../audiosharing/AudioSharingConfirmDialogFragment.java | 2 +- .../audiosharing/AudioSharingConfirmDialogFragmentTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/layout/dialog_custom_title_audio_sharing.xml b/res/layout/dialog_custom_title_audio_sharing.xml index 692cbc79a51..db55088cf8f 100644 --- a/res/layout/dialog_custom_title_audio_sharing.xml +++ b/res/layout/dialog_custom_title_audio_sharing.xml @@ -23,8 +23,8 @@ diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java index 47dd10f60a4..6921a8da4c0 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java +++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java @@ -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; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java index 9aa00fb8e5d..fe459b270ba 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java @@ -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();