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

Commit dfb8d416 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[Screen share] Update strings and icon for system cast dialog." into main

parents efcdac1d 96466497

packages/SystemUI/res/values/strings.xml

+7 −3
Original line number Diff line number Diff line
@@ -1379,11 +1379,15 @@ 


    <!-- Casting that launched by SysUI (i.e. when there is no app name) -->

    <!-- System casting media projection permission dialog title. [CHAR LIMIT=100] -->

    <string name="media_projection_entry_cast_permission_dialog_title">Start casting?</string>

    <string name="media_projection_entry_cast_permission_dialog_title">Cast your screen?</string>

    <!-- System casting media projection permission option for capturing just a single app [CHAR LIMIT=50] -->

    <string name="media_projection_entry_cast_permission_dialog_option_text_single_app">Cast one app</string>

    <!-- System casting media projection permission option for capturing the whole screen [CHAR LIMIT=50] -->

    <string name="media_projection_entry_cast_permission_dialog_option_text_entire_screen">Cast entire screen</string>

    <!-- System casting media projection permission warning for capturing the whole screen when SysUI casting requests it. [CHAR LIMIT=350] -->

    <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen">When you’re casting, Android has access to anything visible on your screen or played on your device. So be careful with things like passwords, payment details, messages, photos, and audio and video.</string>

    <string name="media_projection_entry_cast_permission_dialog_warning_entire_screen">When you’re casting your entire screen, anything on your screen is visible. So be careful with things like passwords, payment details, messages, photos, and audio and video.</string>

    <!-- System casting media projection permission warning for capturing a single app when SysUI casting requests it. [CHAR LIMIT=350] -->

    <string name="media_projection_entry_cast_permission_dialog_warning_single_app">When you’re casting an app, Android has access to anything shown or played on that app. So be careful with things like passwords, payment details, messages, photos, and audio and video.</string>

    <string name="media_projection_entry_cast_permission_dialog_warning_single_app">When you’re casting an app, anything shown or played in that app is visible. So be careful with things like passwords, payment details, messages, photos, and audio and video.</string>

    <!-- System casting media projection permission button to continue for SysUI casting. [CHAR LIMIT=60] -->

    <string name="media_projection_entry_cast_permission_dialog_continue">Start casting</string>

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

+7 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ class SystemCastPermissionDialogDelegate( 
        appName,

        hostUid,

        mediaProjectionMetricsLogger,

        dialogIconDrawable = R.drawable.ic_cast_connected,

    ) {

    override fun onCreate(dialog: AlertDialog, savedInstanceState: Bundle?) {

        super.onCreate(dialog, savedInstanceState)
@@ -82,7 +83,9 @@ class SystemCastPermissionDialogDelegate( 
                listOf(

                    ScreenShareOption(

                        mode = SINGLE_APP,

                        spinnerText = R.string.screen_share_permission_dialog_option_single_app,

                        spinnerText =

                            R.string

                                .media_projection_entry_cast_permission_dialog_option_text_single_app,

                        warningText =

                            R.string

                                .media_projection_entry_cast_permission_dialog_warning_single_app,
@@ -90,7 +93,9 @@ class SystemCastPermissionDialogDelegate( 
                    ),

                    ScreenShareOption(

                        mode = ENTIRE_SCREEN,

                        spinnerText = R.string.screen_share_permission_dialog_option_entire_screen,

                        spinnerText =

                            R.string

                                .media_projection_entry_cast_permission_dialog_option_text_entire_screen,

                        warningText =

                            R.string

                                .media_projection_entry_cast_permission_dialog_warning_entire_screen,

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

+4 −2
Original line number Diff line number Diff line
@@ -44,8 +44,10 @@ class SystemCastPermissionDialogDelegateTest : SysuiTestCase() { 


    private val appName = "Test App"



    private val resIdSingleApp = R.string.screen_share_permission_dialog_option_single_app

    private val resIdFullScreen = R.string.screen_share_permission_dialog_option_entire_screen

    private val resIdSingleApp =

        R.string.media_projection_entry_cast_permission_dialog_option_text_single_app

    private val resIdFullScreen =

        R.string.media_projection_entry_cast_permission_dialog_option_text_entire_screen

    private val resIdSingleAppDisabled =

        R.string.media_projection_entry_app_permission_dialog_single_app_disabled