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

Commit a575ba27 authored by yyalan's avatar yyalan
Browse files

[Partial Screensharing] Set 'Single App' as the default option 

Bug: 301418347
Test: ScreenRecordPermissionDialogTest
Change-Id: Ie6f9c2565b1f0f3e82e1c1f20eeb28ccf6439945
parent 86a91b19

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

+5 −5
Original line number Diff line number Diff line
@@ -88,16 +88,16 @@ class MediaProjectionPermissionDialog( 
                    null

                }

            return listOf(

                ScreenShareOption(

                    mode = ENTIRE_SCREEN,

                    spinnerText = R.string.screen_share_permission_dialog_option_entire_screen,

                    warningText = entireScreenWarningText

                ),

                ScreenShareOption(

                    mode = SINGLE_APP,

                    spinnerText = R.string.screen_share_permission_dialog_option_single_app,

                    warningText = singleAppWarningText,

                    spinnerDisabledText = singleAppDisabledText,

                ),

                ScreenShareOption(

                    mode = ENTIRE_SCREEN,

                    spinnerText = R.string.screen_share_permission_dialog_option_entire_screen,

                    warningText = entireScreenWarningText

                )

            )

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import kotlin.annotation.Retention 
@IntDef(ENTIRE_SCREEN, SINGLE_APP)

annotation class ScreenShareMode



const val ENTIRE_SCREEN = 0

const val SINGLE_APP = 1

const val SINGLE_APP = 0

const val ENTIRE_SCREEN = 1



class ScreenShareOption(

    @ScreenShareMode val mode: Int,

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

+5 −5
Original line number Diff line number Diff line
@@ -185,15 +185,15 @@ class ScreenRecordPermissionDialog( 


        private fun createOptionList(): List<ScreenShareOption> {

            return listOf(

                ScreenShareOption(

                    ENTIRE_SCREEN,

                    R.string.screen_share_permission_dialog_option_entire_screen,

                    R.string.screenrecord_permission_dialog_warning_entire_screen

                ),

                ScreenShareOption(

                    SINGLE_APP,

                    R.string.screen_share_permission_dialog_option_single_app,

                    R.string.screenrecord_permission_dialog_warning_single_app

                ),

                ScreenShareOption(

                    ENTIRE_SCREEN,

                    R.string.screen_share_permission_dialog_option_entire_screen,

                    R.string.screenrecord_permission_dialog_warning_entire_screen

                )

            )

        }

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

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.systemui.res.R 
import com.android.systemui.settings.UserContextProvider

import com.android.systemui.util.mockito.mock

import com.google.common.truth.Truth.assertThat

import junit.framework.Assert.assertEquals

import org.junit.After

import org.junit.Before

import org.junit.Test
@@ -110,6 +111,15 @@ class ScreenRecordPermissionDialogTest : SysuiTestCase() { 
        assertThat(dialog.isShowing).isTrue()

    }



    @Test

    fun showDialog_singleAppIsDefault() {

        dialog.show()



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

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

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

    }



    @Test

    fun showDialog_cancelClicked_dialogIsDismissed() {

        dialog.show()