Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix cancel button on screen recording dialog when PSS enabled" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-30 09:55:12 +00:00
committed by Android (Google) Code Review
parent 6daf38c0e5 1c881245b2
commit c2f1f42103
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialog.kt
View File

@@ -93,6 +93,7 @@ class ScreenRecordPermissionDialog(
} }
dismiss() dismiss()
} }
setCancelButtonOnClickListener { dismiss() }
initRecordOptionsView() initRecordOptionsView()
} }

20
packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogTest.kt
View File

@@ -104,6 +104,26 @@ class ScreenRecordPermissionDialogTest : SysuiTestCase() {
assertThat(visibility).isEqualTo(View.VISIBLE) 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) { private fun onSpinnerItemSelected(position: Int) {
val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_spinner) val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_spinner)
spinner.onItemSelectedListener.onItemSelected(spinner, mock(), position, /* id= */ 0) spinner.onItemSelectedListener.onItemSelected(spinner, mock(), position, /* id= */ 0)