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

Commit 9d786f29 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17117243

Change-Id: I872483ba7d0e23100099b2f8d99db42fae6dd1e4
parents 91a6bfff ce24f919

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

core/res/res/values/symbols.xml

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