Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 68cb9fcc: am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev

Browse Source 
* commit '68cb9fccc09c4ca13beb52a3bc7e385e8a7064f3':
  Update screen pinning and recents strings to say Overview
This commit is contained in:
Jason Monk
2014-10-14 23:11:58 +00:00
committed by Android Git Automerger
parent 29d82bbfc9 68cb9fccc0
commit 417bc6cc5f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/values/strings.xml
View File

@@ -4831,17 +4831,17 @@
<string name="day_of_week_label_typeface">sans-serif</string> <string name="day_of_week_label_typeface">sans-serif</string>
<!-- Notify use that they are in Lock-to-app --> <!-- 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 --> <!-- 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 --> <!-- 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> <string name="lock_to_app_toast_locked">Screen is pinned. Unpinning isn\'t allowed by your organization.</string>
<!-- Lock-to-app dialog title. --> <!-- Lock-to-app dialog title. -->
<string name="lock_to_app_title">Use screen pinning?</string> <string name="lock_to_app_title">Use screen pinning?</string>
<!-- Lock-to-app dialog description. --> <!-- 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. --> <!-- 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. --> <!-- Lock-to-app negative response. -->
<string name="lock_to_app_negative">NO, THANKS</string> <string name="lock_to_app_negative">NO, THANKS</string>
<!-- Lock-to-app positive response. --> <!-- Lock-to-app positive response. -->

8
packages/SystemUI/res/values/strings.xml
View File

@@ -40,8 +40,8 @@
<!-- Message that is read when you enter recent apps in TalkBack --> <!-- Message that is read when you enter recent apps in TalkBack -->
<plurals name="status_bar_accessibility_recent_apps"> <plurals name="status_bar_accessibility_recent_apps">
<item quantity="one">1 recent app</item> <item quantity="one">1 screen in Overview</item>
<item quantity="other">%d recent apps</item> <item quantity="other">%d screens in Overview</item>
</plurals> </plurals>
<!-- The label in the bar at the top of the status bar when there are no notifications <!-- The label in the bar at the top of the status bar when there are no notifications
@@ -201,7 +201,7 @@
<!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_menu">Menu</string> <string name="accessibility_menu">Menu</string>
<!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- 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] --> <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
<string name="accessibility_search_light">Search</string> <string name="accessibility_search_light">Search</string>
<!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -408,7 +408,7 @@
<!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] --> <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
<string name="accessibility_desc_settings">Settings</string> <string name="accessibility_desc_settings">Settings</string>
<!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- 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] --> <!-- 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> <string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>