diff options
| author | Jason Monk <jmonk@google.com> | 2014-10-14 22:42:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-14 22:42:55 +0000 |
| commit | f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a (patch) | |
| tree | e40d2758d1a128dca476b75fccfedbe03dba8ec5 | |
| parent | cedb6dc7f2e19120d6889bc681d143bfb2891b80 (diff) | |
| parent | cdc459feb22ad02e6fc268b2a5173ea936bb12a8 (diff) | |
| download | frameworks_base-f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a.zip frameworks_base-f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a.tar.gz frameworks_base-f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a.tar.bz2 | |
Merge "Update screen pinning and recents strings to say Overview" into lmp-dev
| -rw-r--r-- | core/res/res/values/strings.xml | 8 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 4aabc84..c156887 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4839,17 +4839,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> |