From 00951987c1fa5ec6319ab482900a986b71ed2f32 Mon Sep 17 00:00:00 2001 From: Evan Chen Date: Thu, 24 Feb 2022 00:09:06 +0000 Subject: [PATCH] Introduce vendor header for selfManaged dialog Test: Test: atest CtsCompanionDeviceManagerCoreTestCases atest CtsCompanionDeviceManagerUiAutomationTestCases atest CtsOsTestCases:CompanionDeviceManagerTest Bug: 216638097 Change-Id: Ib73b17c81bf9ac0cc7a98459cffbd9a233c9fbe5 --- .../res/drawable/helper_ok_button.xml | 22 +++ .../res/layout/activity_confirmation.xml | 18 +-- .../res/layout/helper_confirmation.xml | 63 ++++++++ .../res/layout/vendor_header.xml | 48 ++++++ .../res/values/strings.xml | 20 ++- .../res/values/styles.xml | 38 +++++ .../CompanionDeviceActivity.java | 80 +++++++++- .../CompanionVendorHelperDialogFragment.java | 149 ++++++++++++++++++ .../android/companiondevicemanager/Utils.java | 51 ++++++ 9 files changed, 472 insertions(+), 17 deletions(-) create mode 100644 packages/CompanionDeviceManager/res/drawable/helper_ok_button.xml create mode 100644 packages/CompanionDeviceManager/res/layout/helper_confirmation.xml create mode 100644 packages/CompanionDeviceManager/res/layout/vendor_header.xml create mode 100644 packages/CompanionDeviceManager/res/values/styles.xml create mode 100644 packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java diff --git a/packages/CompanionDeviceManager/res/drawable/helper_ok_button.xml b/packages/CompanionDeviceManager/res/drawable/helper_ok_button.xml new file mode 100644 index 0000000000000..f9ec5d0dce558 --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/helper_ok_button.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml index 70cbfdf5cefc0..f30dadffa7884 100644 --- a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml +++ b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml @@ -15,14 +15,10 @@ --> + style="@style/ContainerLayout"> + + + @@ -51,9 +47,9 @@ + android:layout_width="match_parent" + android:scrollbars="vertical" + android:layout_height="200dp" /> diff --git a/packages/CompanionDeviceManager/res/layout/helper_confirmation.xml b/packages/CompanionDeviceManager/res/layout/helper_confirmation.xml new file mode 100644 index 0000000000000..8fd1fb0de8912 --- /dev/null +++ b/packages/CompanionDeviceManager/res/layout/helper_confirmation.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + +