diff options
| author | Jason Monk <jmonk@google.com> | 2014-08-12 17:26:36 -0400 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2014-08-14 20:06:41 +0000 |
| commit | 815e057b9bb19acd77bf01ecb690b6e9fa85902e (patch) | |
| tree | 0a70e6d8aab55a8a65a9be2e04f024cb0c99a21f /core | |
| parent | e07b595519e68a8ee524b1886dea01475047abec (diff) | |
| download | frameworks_base-815e057b9bb19acd77bf01ecb690b6e9fa85902e.zip frameworks_base-815e057b9bb19acd77bf01ecb690b6e9fa85902e.tar.gz frameworks_base-815e057b9bb19acd77bf01ecb690b6e9fa85902e.tar.bz2 | |
Switch exiting screen pinning to recents+back
When accessibility is on, still use just recents.
While here fix strings to be less wrong. Still need finalization.
Bug: 16649417
Change-Id: I94debe9471d5132f1f662543cc98cbde638c758d
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/strings.xml | 18 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d74aaeb..52c3db5 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4839,24 +4839,28 @@ <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">You are in lock-to-app mode. To exit, touch and hold the Recents button</string> + <string name="lock_to_app_toast">To unpin this screen, touch and hold Back and Recents 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> <!-- Notify user that they are locked in lock-to-app mode --> - <string name="lock_to_app_toast_locked">You are in Lock-to-App mode.</string> + <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 lock-to-app?</string> + <string name="lock_to_app_title">Use screen pinning?</string> <!-- Lock-to-app dialog description. --> - <string name="lock_to_app_description">Lock-to-app locks the display in a single app.\n\nTo exit, touch and hold the Recents button.</string> + <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> + <!-- 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> <!-- Lock-to-app negative response. --> <string name="lock_to_app_negative">NO, THANKS</string> <!-- Lock-to-app positive response. --> <string name="lock_to_app_positive">START</string> <!-- Starting lock-to-app indication. --> - <string name="lock_to_app_start">Locked to app</string> + <string name="lock_to_app_start">Screen pinned</string> <!-- Exting lock-to-app indication. --> - <string name="lock_to_app_exit">No longer locked to app</string> + <string name="lock_to_app_exit">Screen unpinned</string> <!-- Lock-to-app checkbox for lock on exit --> - <string name="lock_to_app_use_screen_lock">Ask for %1$s before exiting</string> + <string name="lock_to_app_use_screen_lock">Ask for %1$s before unpinning</string> <!-- Lock-to-app unlock pin string --> <string name="lock_to_app_unlock_pin">PIN</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 220f5ab..45ba51e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -610,9 +610,11 @@ <java-symbol type="string" name="last_month" /> <java-symbol type="string" name="launchBrowserDefault" /> <java-symbol type="string" name="lock_to_app_toast" /> + <java-symbol type="string" name="lock_to_app_toast_accessible" /> <java-symbol type="string" name="lock_to_app_toast_locked" /> <java-symbol type="string" name="lock_to_app_title" /> <java-symbol type="string" name="lock_to_app_description" /> + <java-symbol type="string" name="lock_to_app_description_accessible" /> <java-symbol type="string" name="lock_to_app_negative" /> <java-symbol type="string" name="lock_to_app_positive" /> <java-symbol type="layout" name="lock_to_app_checkbox" /> |