Snap for 9335089 from 96c4978054d8524112169b0276b40d788fd03218 to tm-qpr2-release (e83e2dd1) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ public class TransitionAnimationHelper {
		.setPixelFormat(PixelFormat.RGBA_8888)
		.setChildrenOnly(true)
		.setAllowProtected(true)
		.setCaptureSecureLayers(true)
		.build();
		final SurfaceControl.ScreenshotHardwareBuffer edgeBuffer =
		SurfaceControl.captureLayers(captureArgs);

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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 {

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

+27 −10

Original line number	Diff line number	Diff line
		@@ -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)
		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
		)
		)
		}

services/core/java/com/android/server/wm/SurfaceAnimationRunner.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -440,6 +440,7 @@ class SurfaceAnimationRunner {
		.setPixelFormat(PixelFormat.RGBA_8888)
		.setChildrenOnly(true)
		.setAllowProtected(true)
		.setCaptureSecureLayers(true)
		.build();
		final SurfaceControl.ScreenshotHardwareBuffer edgeBuffer =
		SurfaceControl.captureLayers(captureArgs);