Revert "[Screen share] Update strings and icon for share-to-app ..."
Revert submission 28431498-caitlinshk-share-to-app-dialog-strings
Reason for revert: Droidmonitor created revert due to b/357628468. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:28431498-caitlinshk-share-to-app-dialog-strings
Change-Id: I38c100e6588f99063ed330847e3469fb88d4cf48
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index d30b77e..dd4ede4 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1367,18 +1367,13 @@
<!-- Media projection that launched from 1P/3P apps -->
<!-- 1P/3P app media projection permission dialog title. [CHAR LIMIT=NONE] -->
- <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>
- <!-- 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="media_projection_entry_app_permission_dialog_title">Start recording or casting with <xliff:g id="app_seeking_permission" example="Meet">%s</xliff:g>?</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>
+ <string name="media_projection_entry_app_permission_dialog_warning_entire_screen">When you’re sharing, recording, or casting, <xliff:g id="app_seeking_permission" example="Meet">%s</xliff:g> 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>
<!-- 1P/3P app media projection permission warning for capturing an app. [CHAR LIMIT=350] -->
- <string name="media_projection_entry_app_permission_dialog_warning_single_app">When you’re sharing an app, anything shown or played in that app 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>
+ <string name="media_projection_entry_app_permission_dialog_warning_single_app">When you’re sharing, recording, or casting an app, <xliff:g id="app_seeking_permission" example="Meet">%s</xliff:g> 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>
<!-- 1P/3P apps media projection permission button to continue with app selection or recording [CHAR LIMIT=60] -->
- <string name="media_projection_entry_app_permission_dialog_continue_entire_screen">Share screen</string>
+ <string name="media_projection_entry_app_permission_dialog_continue">Start</string>
<!-- 1P/3P apps disabled the single app projection option. [CHAR LIMIT=NONE] -->
<string name="media_projection_entry_app_permission_dialog_single_app_disabled"><xliff:g id="app_name" example="Meet">%1$s</xliff:g> has disabled this option</string>
diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegate.kt
index 4b132d0..8bf2202 100644
--- a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegate.kt
+++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegate.kt
@@ -48,7 +48,6 @@
appName,
hostUid,
mediaProjectionMetricsLogger,
- dialogIconDrawable = R.drawable.ic_present_to_all,
) {
override fun onCreate(dialog: AlertDialog, savedInstanceState: Bundle?) {
super.onCreate(dialog, savedInstanceState)
@@ -84,28 +83,22 @@
listOf(
ScreenShareOption(
mode = SINGLE_APP,
- spinnerText =
- R.string
- .media_projection_entry_app_permission_dialog_option_text_single_app,
+ spinnerText = R.string.screen_share_permission_dialog_option_single_app,
warningText =
R.string
.media_projection_entry_app_permission_dialog_warning_single_app,
startButtonText =
- R.string
- .media_projection_entry_generic_permission_dialog_continue_single_app,
+ R.string.media_projection_entry_app_permission_dialog_continue,
spinnerDisabledText = singleAppDisabledText,
),
ScreenShareOption(
mode = ENTIRE_SCREEN,
- spinnerText =
- R.string
- .media_projection_entry_app_permission_dialog_option_text_entire_screen,
+ spinnerText = R.string.screen_share_permission_dialog_option_entire_screen,
warningText =
R.string
.media_projection_entry_app_permission_dialog_warning_entire_screen,
startButtonText =
- R.string
- .media_projection_entry_app_permission_dialog_continue_entire_screen,
+ R.string.media_projection_entry_app_permission_dialog_continue,
)
)
return if (singleAppDisabledText != null) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegateTest.kt
index 04ef1be..c57aa36 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegateTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/permission/ShareToAppPermissionDialogDelegateTest.kt
@@ -29,7 +29,6 @@
import com.android.systemui.res.R
import com.android.systemui.statusbar.phone.AlertDialogWithDelegate
import com.android.systemui.statusbar.phone.SystemUIDialog
-import com.google.common.truth.Truth.assertThat
import kotlin.test.assertEquals
import org.junit.After
import org.junit.Test
@@ -45,10 +44,8 @@
private val appName = "Test App"
- private val resIdSingleApp =
- R.string.media_projection_entry_app_permission_dialog_option_text_single_app
- private val resIdFullScreen =
- R.string.media_projection_entry_app_permission_dialog_option_text_entire_screen
+ 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 resIdSingleAppDisabled =
R.string.media_projection_entry_app_permission_dialog_single_app_disabled
@@ -118,36 +115,6 @@
assertEquals(context.getString(resIdFullScreen), secondOptionText)
}
- @Test
- fun startButtonText_entireScreenSelected() {
- setUpAndShowDialog()
- onSpinnerItemSelected(ENTIRE_SCREEN)
-
- val startButtonText = dialog.requireViewById<TextView>(android.R.id.button1).text
-
- assertThat(startButtonText)
- .isEqualTo(
- context.getString(
- R.string.media_projection_entry_app_permission_dialog_continue_entire_screen
- )
- )
- }
-
- @Test
- fun startButtonText_singleAppSelected() {
- setUpAndShowDialog()
- onSpinnerItemSelected(SINGLE_APP)
-
- val startButtonText = dialog.requireViewById<TextView>(android.R.id.button1).text
-
- assertThat(startButtonText)
- .isEqualTo(
- context.getString(
- R.string.media_projection_entry_generic_permission_dialog_continue_single_app
- )
- )
- }
-
private fun setUpAndShowDialog(
mediaProjectionConfig: MediaProjectionConfig? = null,
overrideDisableSingleAppOption: Boolean = false,
@@ -175,10 +142,4 @@
delegate.onCreate(dialog, savedInstanceState = null)
dialog.show()
}
-
- private fun onSpinnerItemSelected(position: Int) {
- val spinner = dialog.requireViewById<Spinner>(R.id.screen_share_mode_options)
- checkNotNull(spinner.onItemSelectedListener)
- .onItemSelected(spinner, mock(), position, /* id= */ 0)
- }
}