From b67178d6c706fa9466611d6ed5411a94050abc6e Mon Sep 17 00:00:00 2001 From: Philip Junker Date: Wed, 8 Sep 2021 17:14:32 +0200 Subject: [PATCH] Add TV specific TvUsbConfirmActivity and TvUsbPermissionActivity. The new activities are based on the TvBottomSheetActivity and do not show the "always use" checkbox because we did not find any strong use case for it. Extracted common logic into UsbDialogHelper which can be used also for non-TV counterparts. Bug: 196780010 Test: Open camera app that requests access to USB camera. Verify that TvUsbPermissionActivity is shown and verify functionality. Test: Have an app installed which registers for USB_DEVICE_ATTACHED broadcast in its AndroidManifest. Attach USB camera device and verify that TvUsbConfirmActivity is shown and verify functionality. Change-Id: Ib100e117ea0ea12adbca1c56e4ec8fc3d0bfc52f --- core/res/res/values-television/config.xml | 15 +- packages/SystemUI/AndroidManifest.xml | 20 ++ .../android/systemui/usb/UsbDialogHelper.java | 299 ++++++++++++++++++ .../systemui/usb/tv/TvUsbConfirmActivity.java | 53 ++++ .../systemui/usb/tv/TvUsbDialogActivity.java | 95 ++++++ .../usb/tv/TvUsbPermissionActivity.java | 62 ++++ 6 files changed, 543 insertions(+), 1 deletion(-) create mode 100644 packages/SystemUI/src/com/android/systemui/usb/UsbDialogHelper.java create mode 100644 packages/SystemUI/src/com/android/systemui/usb/tv/TvUsbConfirmActivity.java create mode 100644 packages/SystemUI/src/com/android/systemui/usb/tv/TvUsbDialogActivity.java create mode 100644 packages/SystemUI/src/com/android/systemui/usb/tv/TvUsbPermissionActivity.java diff --git a/core/res/res/values-television/config.xml b/core/res/res/values-television/config.xml index 55e5685b95e50..606d0f25d490b 100644 --- a/core/res/res/values-television/config.xml +++ b/core/res/res/values-television/config.xml @@ -45,5 +45,18 @@ - com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity + + com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity + + + + + com.android.systemui/com.android.systemui.usb.tv.TvUsbPermissionActivity + + + + + com.android.systemui/com.android.systemui.usb.tv.TvUsbConfirmActivity + diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index eb0bb77dbebd8..8d02af18528ff 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -442,6 +442,26 @@ android:excludeFromRecents="true"> + + + + + + + +