diff options
| author | 2022-05-05 05:47:31 +0000 | |
|---|---|---|
| committer | 2022-05-05 05:47:31 +0000 | |
| commit | 2b4d1108c7842b804e4180d46ddabe55556b7e7c (patch) | |
| tree | 2ea591333b1b832966fbc2d243b614f755ee9651 | |
| parent | b0557b23655a22d5601f8048151b022b548ff50e (diff) | |
| parent | dd58fa19fce5df77c0da362800abfdb56d0520bb (diff) | |
Merge "Move product string definition" into tm-dev am: b09396142a am: 0af27585e6 am: dd58fa19fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18171679
Change-Id: If7ab518f5fe8ac491ee1235afd343057e35db0a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/res-product/values/strings.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/res-product/values/strings.xml b/packages/SystemUI/res-product/values/strings.xml index c1e81bacbec5..b71caef3f593 100644 --- a/packages/SystemUI/res-product/values/strings.xml +++ b/packages/SystemUI/res-product/values/strings.xml @@ -130,4 +130,8 @@ <!-- Text shown when viewing global actions while phone is locked and additional controls are hidden [CHAR LIMIT=NONE] --> <string name="global_action_lock_message" product="device">Unlock your device for more options</string> + <!-- Text informing the user that their media is now playing on this device. [CHAR LIMIT=50] --> + <string name="media_transfer_playing_this_device" product="default">Playing on this phone</string> + <!-- Text informing the user that their media is now playing on this tablet device. [CHAR LIMIT=50] --> + <string name="media_transfer_playing_this_device" product="tablet">Playing on this tablet</string> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 9ac76c7f7b41..8d92b264fd08 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2255,11 +2255,7 @@ <string name="media_move_closer_to_end_cast">Move closer to <xliff:g id="deviceName" example="My Tablet">%1$s</xliff:g> to play here</string> <!-- Text informing the user that their media is now playing on a different device (deviceName). [CHAR LIMIT=50] --> <string name="media_transfer_playing_different_device">Playing on <xliff:g id="deviceName" example="My Tablet">%1$s</xliff:g></string> - <!-- Text informing the user that their media is now playing on this device. [CHAR LIMIT=50] --> - <string name="media_transfer_playing_this_device" product="default">Playing on this phone</string> - <!-- Text informing the user that their media is now playing on this tablet device. [CHAR LIMIT=50] --> - <string name="media_transfer_playing_this_device" product="tablet">Playing on this tablet</string> - <!-- Text informing the user that the media transfer has failed because something went wrong. [CHAR LIMIT=50] --> + <!-- Text informing the user that the media transfer has failed because something went wrong. [CHAR LIsMIT=50] --> <string name="media_transfer_failed">Something went wrong. Try again.</string> <!-- Error message indicating that a control timed out while waiting for an update [CHAR_LIMIT=30] --> |