From 13d09c97b2e0d696b06189d1d90ad47015ce690f Mon Sep 17 00:00:00 2001 From: Yiyi Shen Date: Fri, 8 Dec 2023 14:52:18 +0800 Subject: [PATCH] [Audiosharing] Refine main sharing dialog. Bug: 305620450 Test: atest AudioSharingDialogFragmentTest Change-Id: Icd9d7524b29bc3a37f27316107176b93510cc12c --- res/drawable/audio_sharing_guidance.png | Bin 0 -> 3109 bytes res/layout/dialog_audio_sharing.xml | 80 +++--- .../AudioSharingDialogFragment.java | 87 ++++--- .../AudioSharingDialogFragmentTest.java | 229 ++++++++++++++++++ 4 files changed, 337 insertions(+), 59 deletions(-) create mode 100644 res/drawable/audio_sharing_guidance.png create mode 100644 tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java diff --git a/res/drawable/audio_sharing_guidance.png b/res/drawable/audio_sharing_guidance.png new file mode 100644 index 0000000000000000000000000000000000000000..c0ab6377019b3d1a85b14f502c54eecb3f80eb2b GIT binary patch literal 3109 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 literal 0 HcmV?d00001 diff --git a/res/layout/dialog_audio_sharing.xml b/res/layout/dialog_audio_sharing.xml index 3b110209af0..3ea2c01d6fd 100644 --- a/res/layout/dialog_audio_sharing.xml +++ b/res/layout/dialog_audio_sharing.xml @@ -19,38 +19,64 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="24dp" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingHorizontal="?android:dialogPreferredPadding" + android:paddingBottom="?android:dialogPreferredPadding"> - - - - - -