From 1c881245b2437ab1b856d113faf5dcb4e8cfc748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Go=CC=88llner?= <chrisgollner@google.com>
Date: Fri, 26 May 2023 15:01:59 +0200
Subject: [PATCH] Fix cancel button on screen recording dialog when PSS enabled

Clicking the cancel button was doing nothing, as the cancel click
listener was not implemented.

Test: ScreenRecordPermissionDialogTest.kt
Test: Manually
Fixes: 284439734
Change-Id: I1f740f87d080645b9fd34256e9abf5b3765dcde5
---
 .../ScreenRecordPermissionDialog.kt           |  1 +
 .../ScreenRecordPermissionDialogTest.kt       | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialog.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialog.kt
index bfaf3d0d2ec52..604d44967e68e 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialog.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialog.kt
@@ -93,6 +93,7 @@ class ScreenRecordPermissionDialog(
             }
             dismiss()
         }
+        setCancelButtonOnClickListener { dismiss() }
         initRecordOptionsView()
     }
 
diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogTest.kt
index 5b094c93ea9df..07feedf1d654a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogTest.kt
@@ -104,6 +104,26 @@ class ScreenRecordPermissionDialogTest : SysuiTestCase() {
         assertThat(visibility).isEqualTo(View.VISIBLE)
     }
 
+    @Test
+    fun showDialog_dialogIsShowing() {
+        dialog.show()
+
+        assertThat(dialog.isShowing).isTrue()
+    }
+
+    @Test
+    fun showDialog_cancelClicked_dialogIsDismissed() {
+        dialog.show()
+
+        clickOnCancel()
+
+        assertThat(dialog.isShowing).isFalse()
+    }
+
+    private fun clickOnCancel() {
+        dialog.requireViewById<View>(android.R.id.button2).performClick()
+    }
+
     private fun onSpinnerItemSelected(position: Int) {
         val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_spinner)
         spinner.onItemSelectedListener.onItemSelected(spinner, mock(), position, /* id= */ 0)