diff options
2 files changed, 27 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java index 22f91f359de8..bfa67a89baca 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java @@ -109,7 +109,6 @@ public class MediaProjectionPermissionActivity extends Activity CharSequence dialogTitle = null; String appName = null; if (Utils.isHeadlessRemoteDisplayProvider(packageManager, mPackageName)) { - // TODO(b/253438807): handle special app name dialogText = getString(R.string.media_projection_dialog_service_text); dialogTitle = getString(R.string.media_projection_dialog_service_title); } else { diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/MediaProjectionPermissionDialog.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/MediaProjectionPermissionDialog.kt index e56ab997e605..c5a82ce110de 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/MediaProjectionPermissionDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/MediaProjectionPermissionDialog.kt @@ -23,11 +23,15 @@ import com.android.systemui.R class MediaProjectionPermissionDialog( context: Context?, private val onStartRecordingClicked: Runnable, - appName: String? -) : BaseScreenSharePermissionDialog(context, createOptionList(), appName) { + private val appName: String? +) : BaseScreenSharePermissionDialog(context, createOptionList(appName), appName) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setDialogTitle(R.string.media_projection_permission_dialog_title) + if (appName == null) { + setDialogTitle(R.string.media_projection_permission_dialog_system_service_title) + } else { + setDialogTitle(R.string.media_projection_permission_dialog_title) + } setStartButtonText(R.string.media_projection_permission_dialog_continue) setStartButtonOnClickListener { // Note that it is important to run this callback before dismissing, so that the @@ -38,17 +42,30 @@ class MediaProjectionPermissionDialog( } companion object { - private fun createOptionList(): List<ScreenShareOption> { + private fun createOptionList(appName: String?): List<ScreenShareOption> { + val singleAppWarningText = + if (appName == null) { + R.string.media_projection_permission_dialog_system_service_warning_single_app + } else { + R.string.media_projection_permission_dialog_warning_single_app + } + val entireScreenWarningText = + if (appName == null) { + R.string.media_projection_permission_dialog_system_service_warning_entire_screen + } else { + R.string.media_projection_permission_dialog_warning_entire_screen + } + return listOf( ScreenShareOption( - ENTIRE_SCREEN, - R.string.media_projection_permission_dialog_option_entire_screen, - R.string.media_projection_permission_dialog_warning_entire_screen + mode = ENTIRE_SCREEN, + spinnerText = R.string.media_projection_permission_dialog_option_entire_screen, + warningText = entireScreenWarningText ), ScreenShareOption( - SINGLE_APP, - R.string.media_projection_permission_dialog_option_single_app, - R.string.media_projection_permission_dialog_warning_single_app + mode = SINGLE_APP, + spinnerText = R.string.media_projection_permission_dialog_option_single_app, + warningText = singleAppWarningText ) ) } |