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

Commit 4ea531e7 authored by Daniel Akinola's avatar Daniel Akinola Committed by Android (Google) Code Review
Browse files

Merge "Update screen_share_mode_spinner to screen_share_mode_options" into main

parents 535468ca f9c407bf

packages/SystemUI/res/layout/screen_share_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
            android:layout_marginTop="@dimen/screenrecord_title_margin_top"

            android:gravity="center"/>

        <Spinner

            android:id="@+id/screen_share_mode_spinner"

            android:id="@+id/screen_share_mode_options"

            android:layout_width="match_parent"

            android:layout_height="@dimen/screenrecord_spinner_height"

            android:layout_marginTop="@dimen/screenrecord_spinner_margin"

packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( 


    private fun initScreenShareSpinner() {

        val adapter = OptionsAdapter(dialog.context.applicationContext, screenShareOptions)

        screenShareModeSpinner = dialog.requireViewById(R.id.screen_share_mode_spinner)

        screenShareModeSpinner = dialog.requireViewById(R.id.screen_share_mode_options)

        screenShareModeSpinner.adapter = adapter

        screenShareModeSpinner.onItemSelectedListener = this

packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionDialogDelegate.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class MediaProjectionPermissionDialogDelegate( 
    private val onStartRecordingClicked: Consumer<MediaProjectionPermissionDialogDelegate>,

    private val onCancelClicked: Runnable,

    private val appName: String?,

    private val forceShowPartialScreenshare: Boolean,

    forceShowPartialScreenshare: Boolean,

    hostUid: Int,

    mediaProjectionMetricsLogger: MediaProjectionMetricsLogger,

) :

packages/SystemUI/tests/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionDialogDelegateTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ class MediaProjectionPermissionDialogDelegateTest : SysuiTestCase() { 
        val overrideDisableSingleAppOption = false

        setUpAndShowDialog(overrideDisableSingleAppOption)



        val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_spinner)

        val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_options)

        val secondOptionText =

            spinner.adapter

                .getDropDownView(1, null, spinner)
@@ -100,7 +100,7 @@ class MediaProjectionPermissionDialogDelegateTest : SysuiTestCase() { 
        val overrideDisableSingleAppOption = true

        setUpAndShowDialog(overrideDisableSingleAppOption)



        val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_spinner)

        val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_options)

        val secondOptionText =

            spinner.adapter

                .getDropDownView(1, null, spinner)

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

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ class ScreenRecordPermissionDialogDelegateTest : SysuiTestCase() { 
    fun testShowDialog_partialScreenSharingEnabled_optionsSpinnerIsVisible() {

        showDialog()



        val visibility = dialog.requireViewById<Spinner>(R.id.screen_share_mode_spinner).visibility

        val visibility = dialog.requireViewById<Spinner>(R.id.screen_share_mode_options).visibility

        assertThat(visibility).isEqualTo(View.VISIBLE)

    }
@@ -155,7 +155,7 @@ class ScreenRecordPermissionDialogDelegateTest : SysuiTestCase() { 
    fun showDialog_singleAppIsDefault() {

        showDialog()



        val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_spinner)

        val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_options)

        val singleApp = context.getString(R.string.screen_share_permission_dialog_option_single_app)

        assertEquals(spinner.adapter.getItem(0), singleApp)

    }
@@ -217,7 +217,7 @@ class ScreenRecordPermissionDialogDelegateTest : SysuiTestCase() { 
    }



    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_options)

        checkNotNull(spinner.onItemSelectedListener)

            .onItemSelected(spinner, mock(), position, /* id= */ 0)

    }