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

Commit 9131356c authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Screen share] Point new string resource name to old string resource. 

CTS tests rely on the string resources
`screen_share_permission_dialog_option_entire_screen` and
`screen_share_permission_dialog_option_single_app` existing so that the
tests can find the right UI elements.

The 24Q3 & 24Q4 builds need to pass the 24Q3 CTS tests, which means we
can't use the new resource name in the CTS tests because the 24Q3 build
would fail since it doesn't have the new reousrce name.

This CL creates an alias from the new resource to the old resource in
SysUI. This lets the SysUI code to keep using the new resource name, and
lets the CTS tests to keep using the old resource name.

Fixes: 353136848
Bug: 352327853
Flag: EXEMPT test only
Test: atest
CtsStatsdAtomHostTestCases:android.cts.statsdatom.media.projection.MediaProjectionAtomsTests
the 24Q4 build on the 24Q3 CTS tests

Change-Id: I6e866e9bb930b89992f6231cae8bd6f75b25602c
parent ed48a531

packages/SystemUI/res/values/strings.xml

+6 −2
Original line number Diff line number Diff line
@@ -1377,9 +1377,13 @@ 
    <string name="media_projection_entry_app_permission_dialog_title">Share your screen with <xliff:g id="app_seeking_permission" example="Meet">%s</xliff:g>?</string>



    <!-- 1P/3P app media projection permission option for capturing just a single app [CHAR LIMIT=50] -->

    <string name="media_projection_entry_app_permission_dialog_option_text_single_app">Share one app</string>

    <string name="screen_share_permission_dialog_option_single_app">Share one app</string>

    <!-- CTS tests rely on the `screen_share_permission_dialog_option_single_app` resource name, so just point the updated resource name to the old resource name. -->

    <string name="media_projection_entry_app_permission_dialog_option_text_single_app">@string/screen_share_permission_dialog_option_single_app</string>

    <!-- 1P/3P app media projection permission option for capturing the whole screen [CHAR LIMIT=50] -->

    <string name="media_projection_entry_app_permission_dialog_option_text_entire_screen">Share entire screen</string>

    <string name="screen_share_permission_dialog_option_entire_screen">Share entire screen</string>

    <!-- CTS tests rely on the `screen_share_permission_dialog_option_entire_screen` resource name, so just point the updated resource name to the old resource name. -->

    <string name="media_projection_entry_app_permission_dialog_option_text_entire_screen">@string/screen_share_permission_dialog_option_entire_screen</string>

    <!-- 1P/3P app media projection permission warning for capturing the whole screen. [CHAR LIMIT=350] -->

    <string name="media_projection_entry_app_permission_dialog_warning_entire_screen">When you’re sharing your entire screen, anything on your screen is visible to <xliff:g id="app_seeking_permission" example="Meet">%s</xliff:g>. So be careful with things like passwords, payment details, messages, photos, and audio and video.</string>

    <!-- 1P/3P app media projection permission warning for capturing an app. [CHAR LIMIT=350] -->