Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96b977e1 authored by Cliff Wu's avatar Cliff Wu
Browse files

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
parent 733ade6f

core/java/com/android/internal/app/BlockedAppStreamingActivity.java

+5 −1
Original line number Diff line number Diff line
@@ -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 {

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5473,6 +5473,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] -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3296,6 +3296,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 -->