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

Commit 7b6308bb authored by Yahav Nussbaum's avatar Yahav Nussbaum Committed by Automerger Merge Worker
Browse files

Merge "Powered off finding string for tablets" into main am: 079ad83c 

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



Change-Id: Ib3371e342e85a2745179b618659e61d36604dedf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 434f8b7d 079ad83c

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

+3 −1
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ 
    <!-- 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>





    <!-- Message shown during shutdown when Find My Device with Dead Battery Finder is active  [CHAR LIMIT=300] -->

    <string name="finder_active" product="default">You can locate this phone with Find My Device even when powered off</string>

    <string name="finder_active" product="tablet">You can locate this tablet with Find My Device even when powered off</string>



</resources>

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -2495,8 +2495,6 @@ 
    <!-- Tuner string -->

    <!-- Tuner string -->



    <!-- Message shown during shutdown when Find My Device with Dead Battery Finder is active  [CHAR LIMIT=300] -->

    <string name="finder_active">You can locate this phone with Find My Device even when powered off</string>

    <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. [CHAR LIMIT=60] -->

    <string name="shutdown_progress">Shutting down\u2026</string>