diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-06-03 14:52:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-03 14:52:58 +0000 |
| commit | 2808907362922f077fa48b97ece28bf9e18482a6 (patch) | |
| tree | c8fb4fdd1ef09071439c6606b405880708a45062 | |
| parent | 55ce00e7effbc4bf94079cbcc109cafc5280bbc4 (diff) | |
| parent | b5b0396ddce8f27582b7405996fc99e3f248fcbd (diff) | |
| download | frameworks_base-2808907362922f077fa48b97ece28bf9e18482a6.zip frameworks_base-2808907362922f077fa48b97ece28bf9e18482a6.tar.gz frameworks_base-2808907362922f077fa48b97ece28bf9e18482a6.tar.bz2 | |
Merge "Updating the pictures and labels for cross-profile intents."
| -rw-r--r-- | core/res/res/drawable-hdpi/work_icon.png | bin | 1153 -> 4442 bytes | |||
| -rw-r--r-- | core/res/res/values/strings.xml | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/drawable-hdpi/work_icon.png b/core/res/res/drawable-hdpi/work_icon.png Binary files differindex e90866b..be8a36e 100644 --- a/core/res/res/drawable-hdpi/work_icon.png +++ b/core/res/res/drawable-hdpi/work_icon.png diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 7234911..9ff67b4 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -457,10 +457,10 @@ <string name="android_system_label">Android System</string> <!-- Label for the user owner in the intent forwarding app. --> - <string name="user_owner_label">Personal</string> + <string name="user_owner_label">Personal apps</string> <!-- Label for a corporate profile in the intent forwarding app. --> - <string name="managed_profile_label">Work</string> + <string name="managed_profile_label">Android for Work</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_costMoney">Services that cost you money</string> |
