Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the strings to match the Figma mock" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-24 17:18:35 +00:00
committed by Android (Google) Code Review
parent 63258db33d 96b977e16e
commit ce24f91981
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/BlockedAppStreamingActivity.java
View File

@@ -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 {

2
core/res/res/values/strings.xml
View File

@@ -5464,6 +5464,8 @@
<!-- Title of the dialog shown when an app is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
<string name="app_streaming_blocked_title"><xliff:g id="activity" example="Permission dialog">%1$s</xliff:g> unavailable</string>
<!-- Title of the dialog shown when the permissioncontroller is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
<string name="app_streaming_blocked_title_for_permission_dialog">Permission needed</string>
<!-- Message shown when an app is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
<string name="app_streaming_blocked_message" product="tv">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g> at this time. Try on your Android TV device instead.</string>
<!-- Message shown when an app is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

1
core/res/res/values/symbols.xml
View File

@@ -3300,6 +3300,7 @@
<java-symbol type="string" name="app_blocked_message" />
<java-symbol type="string" name="app_streaming_blocked_title" />
<java-symbol type="string" name="app_streaming_blocked_title_for_permission_dialog" />
<java-symbol type="string" name="app_streaming_blocked_message" />
<!-- Used internally for assistant to launch activity transitions -->