Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 442ec2e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451076



Change-Id: I32d0d79b89941aac52e9c7bee195d6568e8d8eb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ef3484c c2f1f421

packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialog.kt

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ class ScreenRecordPermissionDialog( 
            }

            dismiss()

        }

        setCancelButtonOnClickListener { dismiss() }

        initRecordOptionsView()

    }

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

+20 −0
Original line number Diff line number Diff line
@@ -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)