PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yiyi Shen
2024-11-20 10:14:13 +00:00
committed by Android (Google) Code Review
parent 22cba6ee40 c527b40370
commit d611829c6b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/dialog_custom_title_audio_sharing.xml
View File

@@ -23,8 +23,8 @@
<ImageView <ImageView
android:id="@+id/title_icon" android:id="@+id/title_icon"
android:layout_width="28dp" android:layout_width="36dp"
android:layout_height="28dp" android:layout_height="36dp"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@null" android:contentDescription="@null"
android:tint="?android:attr/colorControlNormal" /> android:tint="?android:attr/colorControlNormal" />

2
src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
View File

@@ -77,7 +77,7 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen
.setTitleIcon(com.android.settingslib.R.drawable.ic_bt_le_audio_sharing) .setTitleIcon(com.android.settingslib.R.drawable.ic_bt_le_audio_sharing)
.setIsCustomBodyEnabled(true) .setIsCustomBodyEnabled(true)
.setCustomMessage(R.string.audio_sharing_comfirm_dialog_content) .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(); .build();
dialog.setCanceledOnTouchOutside(true); dialog.setCanceledOnTouchOutside(true);
return dialog; return dialog;

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

@@ -115,7 +115,7 @@ public class AudioSharingConfirmDialogFragmentTest {
} }
@Test @Test
public void onCreateDialog_clickOk_dialogDismiss() { public void onCreateDialog_clickClose_dialogDismiss() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING); mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
AudioSharingConfirmDialogFragment.show(mParent); AudioSharingConfirmDialogFragment.show(mParent);
shadowMainLooper().idle(); shadowMainLooper().idle();