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

Commit dd58fa19 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Move product string definition" into tm-dev am: b0939614 am: 0af27585 

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



Change-Id: I1aa5824d46be26bfa25a78b82b624f449b504963
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05237b58 0af27585

packages/SystemUI/res-product/values/strings.xml

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

packages/SystemUI/res/values/strings.xml

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