am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev
* commit 'f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a':
Update screen pinning and recents strings to say Overview
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index a7d197b..987b291 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4844,17 +4844,17 @@
<string name="day_of_week_label_typeface">sans-serif</string>
<!-- Notify use that they are in Lock-to-app -->
- <string name="lock_to_app_toast">To unpin this screen, touch and hold Back and Recents at the same time.</string>
+ <string name="lock_to_app_toast">To unpin this screen, touch and hold Back and Overview at the same time.</string>
<!-- Notify use that they are in Lock-to-app in accessibility mode -->
- <string name="lock_to_app_toast_accessible">To unpin this screen, touch and hold Recents.</string>
+ <string name="lock_to_app_toast_accessible">To unpin this screen, touch and hold Overview.</string>
<!-- Notify user that they are locked in lock-to-app mode -->
<string name="lock_to_app_toast_locked">Screen is pinned. Unpinning isn\'t allowed by your organization.</string>
<!-- Lock-to-app dialog title. -->
<string name="lock_to_app_title">Use screen pinning?</string>
<!-- Lock-to-app dialog description. -->
- <string name="lock_to_app_description">Screen pinning locks the display in a single view.\n\nTo exit, touch and hold Back and Recents at the same time.</string>
+ <string name="lock_to_app_description">Screen pinning locks the display in a single view.\n\nTo unpin, touch and hold Back and Overview at the same time.</string>
<!-- Lock-to-app dialog description when in accessibility mode. -->
- <string name="lock_to_app_description_accessible">Screen pinning locks the display in a single view.\n\nTo exit, touch and hold Recents.</string>
+ <string name="lock_to_app_description_accessible">Screen pinning locks the display in a single view.\n\nTo unpin, touch and hold Overview.</string>
<!-- Lock-to-app negative response. -->
<string name="lock_to_app_negative">NO, THANKS</string>
<!-- Lock-to-app positive response. -->
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 9ee18f3..71b9b61 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -40,8 +40,8 @@
<!-- Message that is read when you enter recent apps in TalkBack -->
<plurals name="status_bar_accessibility_recent_apps">
- <item quantity="one">1 recent app</item>
- <item quantity="other">%d recent apps</item>
+ <item quantity="one">1 screen in Overview</item>
+ <item quantity="other">%d screens in Overview</item>
</plurals>
<!-- The label in the bar at the top of the status bar when there are no notifications
@@ -206,7 +206,7 @@
<!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_menu">Menu</string>
<!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_recent">Recent screens</string>
+ <string name="accessibility_recent">Overview</string>
<!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
<string name="accessibility_search_light">Search</string>
<!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -413,7 +413,7 @@
<!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
<string name="accessibility_desc_settings">Settings</string>
<!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_desc_recent_apps">Recent screens.</string>
+ <string name="accessibility_desc_recent_apps">Overview.</string>
<!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>