From 96b977e16eb19f7cb9a1646071dd9022f0c249a3 Mon Sep 17 00:00:00 2001 From: Cliff Wu Date: Tue, 8 Mar 2022 15:56:00 +0800 Subject: [PATCH] Update the strings to match the Figma mock - Update the strings to match the Figma mock when the blocked activity is a permission prompt. Bug: 203834118 Test: Manual Change-Id: I38b02e408c3099d73431316840bd5b8e732aee90 --- .../android/internal/app/BlockedAppStreamingActivity.java | 6 +++++- core/res/res/values/strings.xml | 2 ++ core/res/res/values/symbols.xml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/BlockedAppStreamingActivity.java b/core/java/com/android/internal/app/BlockedAppStreamingActivity.java index 31c38220ccc21..2d6c77fdc41be 100644 --- a/core/java/com/android/internal/app/BlockedAppStreamingActivity.java +++ b/core/java/com/android/internal/app/BlockedAppStreamingActivity.java @@ -56,7 +56,11 @@ public class BlockedAppStreamingActivity extends AlertActivity { CharSequence streamedDeviceName = intent.getCharSequenceExtra(EXTRA_STREAMED_DEVICE); if (!TextUtils.isEmpty(streamedDeviceName)) { - mAlertParams.mTitle = getString(R.string.app_streaming_blocked_title, appLabel); + mAlertParams.mTitle = + TextUtils.equals(activityInfo.packageName, + getPackageManager().getPermissionControllerPackageName()) + ? getString(R.string.app_streaming_blocked_title_for_permission_dialog) + : getString(R.string.app_streaming_blocked_title, appLabel); mAlertParams.mMessage = getString(R.string.app_streaming_blocked_message, streamedDeviceName); } else { diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index c8202c5989b54..5a792eff1a75f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5473,6 +5473,8 @@ %1$s unavailable + + Permission needed This can’t be accessed on your %1$s at this time. Try on your Android TV device instead. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 2e1c6c2afc788..9803154f5e5ab 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3296,6 +3296,7 @@ +