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

Commit 59bf8b9b authored by Cliff Wu's avatar Cliff Wu Committed by Automerger Merge Worker
Browse files

Merge "Fix generic wrong strings to comply with the UX guideline" into... 

Merge "Fix generic wrong strings to comply with the UX guideline" into tm-qpr-dev am: 0bc5eed6 am: dc15efd4

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



Change-Id: I636779bfee7917bc5644959aff2e560514411565
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19e80795 dc15efd4

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

+11 −6
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class BlockedAppStreamingActivity extends AlertActivity { 
    private static final String EXTRA_BLOCKED_ACTIVITY_INFO =

            PACKAGE_NAME + ".extra.BLOCKED_ACTIVITY_INFO";

    private static final String EXTRA_STREAMED_DEVICE = PACKAGE_NAME + ".extra.STREAMED_DEVICE";

    private static final String BLOCKED_COMPONENT_PLAYSTORE = "com.android.vending";

    private static final String BLOCKED_COMPONENT_SETTINGS = "com.android.settings";



    @Override
@@ -62,21 +63,25 @@ public class BlockedAppStreamingActivity extends AlertActivity { 
                mAlertParams.mTitle =

                        getString(R.string.app_streaming_blocked_title_for_permission_dialog);

                mAlertParams.mMessage =

                        getString(R.string.app_streaming_blocked_message_for_permission_dialog,

                                streamedDeviceName);

                        getString(R.string.app_streaming_blocked_message, streamedDeviceName);

            } else if (TextUtils.equals(activityInfo.packageName, BLOCKED_COMPONENT_PLAYSTORE)) {

                mAlertParams.mTitle =

                        getString(R.string.app_streaming_blocked_title_for_playstore_dialog);

                mAlertParams.mMessage =

                        getString(R.string.app_streaming_blocked_message, streamedDeviceName);

            } else if (TextUtils.equals(activityInfo.packageName, BLOCKED_COMPONENT_SETTINGS)) {

                mAlertParams.mTitle =

                        getString(R.string.app_streaming_blocked_title_for_settings_dialog);

                mAlertParams.mMessage =

                        getString(R.string.app_streaming_blocked_message, streamedDeviceName);

                        getString(R.string.app_streaming_blocked_message_for_settings_dialog,

                                streamedDeviceName);

            } else {

                mAlertParams.mTitle =

                        getString(R.string.app_streaming_blocked_title, appLabel);

                // No title required

                mAlertParams.mMessage =

                        getString(R.string.app_streaming_blocked_message, streamedDeviceName);

            }

        } else {

            mAlertParams.mTitle = getString(R.string.app_blocked_title);

            // No title required

            mAlertParams.mMessage = getString(R.string.app_blocked_message, appLabel);

        }

        mAlertParams.mPositiveButtonText = getString(android.R.string.ok);

core/res/res/values/strings.xml

+11 −9
Original line number Diff line number Diff line
@@ -5477,6 +5477,8 @@ 
    <string name="app_streaming_blocked_title_for_fingerprint_dialog">Continue on phone</string>

    <!-- Title of the dialog shown when the microphone permission is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_title_for_microphone_dialog">Microphone unavailable</string>

    <!-- Title of the dialog shown when the play store is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_title_for_playstore_dialog">Play Store unavailable</string>

    <!-- Title of the dialog shown when the settings is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_title_for_settings_dialog" product="tv">Android TV settings unavailable</string>

    <!-- Title of the dialog shown when the settings is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->
@@ -5484,23 +5486,23 @@ 
    <!-- Title of the dialog shown when the settings is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_title_for_settings_dialog" product="default">Phone settings unavailable</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>. Try on your Android TV device instead.</string>

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

    <string name="app_streaming_blocked_message" product="tablet">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Try on your tablet instead.</string>

    <string name="app_streaming_blocked_message" product="tablet">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g> at this time. Try on your tablet instead.</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="default">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Try on your phone instead.</string>

    <!-- Message shown when an app is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_permission_dialog" 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] -->

    <string name="app_streaming_blocked_message_for_permission_dialog" product="tablet">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g> at this time. Try on your tablet instead.</string>

    <!-- Message shown when an app is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_permission_dialog" product="default">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g> at this time. Try on your phone instead.</string>

    <string name="app_streaming_blocked_message" product="default">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g> at this time. Try on your phone instead.</string>

    <!-- Message shown when the fingerprint permission is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv">This app is requesting additional security. Try on your Android TV device instead.</string>

    <!-- Message shown when the fingerprint permission is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet">This app is requesting additional security. Try on your tablet instead.</string>

    <!-- Message shown when the fingerprint permission is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default">This app is requesting additional security. Try on your phone instead.</string>

    <!-- Message shown when the settings is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_settings_dialog" product="tv">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Try on your Android TV device instead.</string>

    <!-- Message shown when the settings is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_settings_dialog" product="tablet">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Try on your tablet instead.</string>

    <!-- Message shown when the settings is blocked from being streamed to a remote device. [CHAR LIMIT=NONE] -->

    <string name="app_streaming_blocked_message_for_settings_dialog" product="default">This can’t be accessed on your <xliff:g id="device" example="Chromebook">%1$s</xliff:g>. Try on your phone instead.</string>



    <!-- Message displayed in dialog when app is too old to run on this verison of android. [CHAR LIMIT=NONE] -->

    <string name="deprecated_target_sdk_message">This app was built for an older version of Android and may not work properly. Try checking for updates, or contact the developer.</string>

core/res/res/values/symbols.xml

+2 −1
Original line number Diff line number Diff line
@@ -3309,10 +3309,11 @@ 
  <java-symbol type="string" name="app_streaming_blocked_title_for_camera_dialog" />

  <java-symbol type="string" name="app_streaming_blocked_title_for_fingerprint_dialog" />

  <java-symbol type="string" name="app_streaming_blocked_title_for_microphone_dialog" />

  <java-symbol type="string" name="app_streaming_blocked_title_for_playstore_dialog" />

  <java-symbol type="string" name="app_streaming_blocked_title_for_settings_dialog" />

  <java-symbol type="string" name="app_streaming_blocked_message" />

  <java-symbol type="string" name="app_streaming_blocked_message_for_permission_dialog" />

  <java-symbol type="string" name="app_streaming_blocked_message_for_fingerprint_dialog" />

  <java-symbol type="string" name="app_streaming_blocked_message_for_settings_dialog" />



  <!-- Used internally for assistant to launch activity transitions -->

  <java-symbol type="id" name="cross_task_transition" />