diff options
| author | 2024-12-11 09:48:50 -0800 | |
|---|---|---|
| committer | 2024-12-11 09:48:50 -0800 | |
| commit | c9ffea6fa76310f15a03b145e02d0a9fa12b2752 (patch) | |
| tree | 239ca90fb83c4ac6a07d2f9b176501059aea4f80 | |
| parent | 4fb29dba8e11fa4efb4425cfd6028e89f23ecebf (diff) | |
| parent | 7b6308bb6f8f500b773e9aa558253c141cfc3140 (diff) | |
Merge "Powered off finding string for tablets" into main am: 079ad83c2d am: 7b6308bb6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3406479
Change-Id: Iba6ab493295d9d96f8728a7b023968da444fea13
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 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/res-product/values/strings.xml b/packages/SystemUI/res-product/values/strings.xml index 42733a20ffae..0c29bb4b2279 100644 --- a/packages/SystemUI/res-product/values/strings.xml +++ b/packages/SystemUI/res-product/values/strings.xml @@ -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> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index f96c4431a7e6..f927e26e0cd9 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2591,8 +2591,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> |