diff options
| -rw-r--r-- | core/res/res/values/strings.xml | 17 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 12 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java | 5 |
3 files changed, 20 insertions, 14 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index b2fa294f77be..a7156cb75c95 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -647,11 +647,11 @@ <!-- Label for the Android system components when they are shown to the user. --> <string name="android_system_label">Android System</string> - <!-- Label for the user owner in the intent forwarding app. --> - <string name="user_owner_label">Switch to Personal</string> + <!-- "Switch" is a verb; it means to change user profile by tapping another user profile name. --> + <string name="user_owner_label">Switch to personal profile</string> - <!-- Label for a corporate profile in the intent forwarding app. --> - <string name="managed_profile_label">Switch to Work</string> + <!-- "Switch" is a verb; it means to change user profile by tapping another user profile name. --> + <string name="managed_profile_label">Switch to work profile</string> <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <string name="permgrouplab_contacts">Contacts</string> @@ -4596,11 +4596,10 @@ <!-- Menu item in the locale menu [CHAR LIMIT=30] --> <string name="locale_search_menu">Search</string> - <!-- Title for dialog displayed when work profile is turned off. [CHAR LIMIT=30] --> - <string name="work_mode_off_title">Turn on work mode?</string> - <!-- Message displayed in dialog when work profile is turned off. [CHAR LIMIT=NONE] --> - <string name="work_mode_off_message">This will turn on your work profile, including apps, - background sync, and related features</string> + <!-- Title of a dialog. The string is asking if the user wants to turn on their work profile, which contains work apps that are managed by their employer. "Work" is an adjective. [CHAR LIMIT=30] --> + <string name="work_mode_off_title">Turn on work profile?</string> + <!-- Text in a dialog. This string describes what will happen if a user decides to turn on their work profile. "Work profile" is used as an adjective. [CHAR LIMIT=NONE] --> + <string name="work_mode_off_message">Your work apps, notifications, data, and other work profile features will be turned on</string> <!-- Title for button to turn on work profile. [CHAR LIMIT=NONE] --> <string name="work_mode_turn_on">Turn on</string> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index dde4dcfb23fe..93268a7b0a95 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -457,7 +457,7 @@ <string name="accessibility_casting">@string/quick_settings_casting</string> <!-- Content description of the work mode icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_work_mode">Work mode</string> + <string name="accessibility_work_mode">@string/quick_settings_work_mode_on_label</string> <!-- Content description to tell the user that this button will remove an application from recents --> <string name="accessibility_recents_item_will_be_dismissed">Dismiss <xliff:g id="app" example="Calendar">%s</xliff:g>.</string> @@ -771,8 +771,14 @@ <string name="quick_settings_cellular_detail_data_limit"><xliff:g id="data_limit" example="2.0 GB">%s</xliff:g> limit</string> <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] --> <string name="quick_settings_cellular_detail_data_warning"><xliff:g id="data_limit" example="2.0 GB">%s</xliff:g> warning</string> - <!-- QuickSettings: Work mode [CHAR LIMIT=NONE] --> - <string name="quick_settings_work_mode_label">Work mode</string> + <!-- QuickSettings: This string is in the easy-to-view settings that a user can pull down from + the top of their phone's screen. This is a label for a toggle to turn the work profile on and + off. "Work profile" means a separate profile on a user's phone that's specifically for their + work apps and managed by their company. "Work" is used as an adjective. [CHAR LIMIT=NONE] --> + <string name="quick_settings_work_mode_on_label">Work profile</string> + <!-- QuickSettings: This is a label for a toggle to turn the work profile on and off and this is + shown when work profile is off. [CHAR LIMIT=NONE] --> + <string name="quick_settings_work_mode_off_label">Notifications & apps are off</string> <!-- QuickSettings: Label for the toggle to activate Night display (renamed "Night Light" with title caps). [CHAR LIMIT=20] --> <string name="quick_settings_night_display_label">Night Light</string> <!-- QuickSettings: NFC tile [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java index 5f7d6fb41311..e098fd876735 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java @@ -83,7 +83,7 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements @Override public CharSequence getTileLabel() { - return mContext.getString(R.string.quick_settings_work_mode_label); + return mContext.getString(R.string.quick_settings_work_mode_on_label); } @Override @@ -98,16 +98,17 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements state.value = mProfileController.isWorkModeEnabled(); } - state.label = mContext.getString(R.string.quick_settings_work_mode_label); state.icon = mIcon; if (state.value) { state.slash.isSlashed = false; state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_work_mode_on); + state.label = mContext.getString(R.string.quick_settings_work_mode_on_label); } else { state.slash.isSlashed = true; state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_work_mode_off); + state.label = mContext.getString(R.string.quick_settings_work_mode_off_label); } state.expandedAccessibilityClassName = Switch.class.getName(); state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; |