From 6b3b751492d01b23b87a4ee6b807dc00c3b5770e Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Fri, 25 Jul 2014 21:34:04 +0100
Subject: [PATCH] Update icon and text for a managed profile

Bug: 16369104
Change-Id: I15d25910332d92e1638cdc63422e7e28c2f07d85
---
 res/values/strings.xml                             |  4 ++--
 src/com/android/settings/UserSpinnerAdapter.java   | 14 +++++++++-----
 .../android/settings/net/UidDetailProvider.java    |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8fbccbaa244..db092de2db2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4816,8 +4816,6 @@
     <string name="data_usage_cycle">Data usage cycle</string>
     <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
     <string name="data_usage_app_items_header_text">App usage</string>
-    <!-- Title for managed user in data usage list. [CHAR LIMIT=25] -->
-    <string name="data_usage_managed_user_text">Work profile</string>
     <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_roaming">Data roaming</string>
     <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
@@ -5846,4 +5844,6 @@
     <!-- [CHAR LIMIT=300] Screen pinning description -->
     <string name="screen_pinning_description">When this setting is turned on, you can put the device in a state that keeps the current screen in view.\n\nTo pin a screen:\n\n1. Turn this setting on.\n\n2. Open an app.\n\n3. Touch the Recents button.\n\n4. Touch the pin icon.</string>
 
+    <!-- Title for a managed (work) profile. [CHAR LIMIT=25] -->
+    <string name="managed_user_title">Work profile</string>
 </resources>
diff --git a/src/com/android/settings/UserSpinnerAdapter.java b/src/com/android/settings/UserSpinnerAdapter.java
index c267f6ff678..32ef3be47a7 100644
--- a/src/com/android/settings/UserSpinnerAdapter.java
+++ b/src/com/android/settings/UserSpinnerAdapter.java
@@ -18,6 +18,7 @@ package com.android.settings;
 
 import android.content.Context;
 import android.content.pm.UserInfo;
+import android.content.res.Resources;
 import android.database.DataSetObserver;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
@@ -31,6 +32,7 @@ import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
 import com.android.settings.drawable.CircleFramedDrawable;
+import com.android.settings.R;
 
 import java.util.ArrayList;
 
@@ -48,12 +50,14 @@ public class UserSpinnerAdapter implements SpinnerAdapter {
         public UserDetails(UserHandle userHandle, UserManager um, Context context) {
             mUserHandle = userHandle;
             UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
-            name = userInfo.name;
-            Bitmap bitmap = um.getUserIcon(userHandle.getIdentifier());
-            if (bitmap != null) {
-                icon = CircleFramedDrawable.getInstance(context, bitmap);
+            if (userInfo.isManagedProfile()) {
+                name = context.getString(R.string.managed_user_title);
+                icon = Resources.getSystem().getDrawable(
+                        com.android.internal.R.drawable.ic_corp_icon);
             } else {
-                icon = null;
+                name = userInfo.name;
+                Bitmap bitmap = um.getUserIcon(userHandle.getIdentifier());
+                icon = (bitmap == null) ? null : CircleFramedDrawable.getInstance(context, bitmap);
             }
         }
     }
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index 4bc4b69026f..cd101c98fc4 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -132,7 +132,7 @@ public class UidDetailProvider {
             final UserInfo info = um.getUserInfo(userHandle);
             if (info != null) {
                 if (info.isManagedProfile()) {
-                    detail.label = res.getString(R.string.data_usage_managed_user_text);
+                    detail.label = res.getString(R.string.managed_user_title);
                     detail.icon = Resources.getSystem().getDrawable(
                             com.android.internal.R.drawable.ic_corp_icon);
                 } else {