PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply predefined icon and label to managed profiles

Browse Source 
Bug: 18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
This commit is contained in:
Alexandra Gherghina
2014-10-30 11:56:18 +00:00
parent 6f5b23f3fc
commit 0f5440f6e2
5 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/Utils.java
View File

@@ -61,8 +61,6 @@ import android.provider.ContactsContract.Profile;
import android.provider.ContactsContract.RawContacts;
import android.service.persistentdata.PersistentDataBlockManager;
import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -70,10 +68,8 @@ import android.view.ViewGroup;
import android.widget.ListView;
import android.widget.TabWidget;
import com.android.internal.util.ImageUtils;
import com.android.internal.util.UserIcons;
import com.android.settings.UserSpinnerAdapter.UserDetails;
import com.android.settings.dashboard.DashboardCategory;
import com.android.settings.dashboard.DashboardTile;
import com.android.settings.drawable.CircleFramedDrawable;
@@ -858,6 +854,12 @@ public final class Utils {
* Returns a circular icon for a user.
*/
public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {
if (user.isManagedProfile()) {
// We use predefined values for managed profiles
Bitmap b = BitmapFactory.decodeResource(context.getResources(),
com.android.internal.R.drawable.ic_corp_icon);
return CircleFramedDrawable.getInstance(context, b);
}
if (user.iconPath != null) {
Bitmap icon = um.getUserIcon(user.id);
if (icon != null) {
@@ -867,6 +869,23 @@ public final class Utils {
return UserIcons.getDefaultUserIcon(user.id, /* light= */ false);
}
/**
* Returns a label for the user, in the form of "User: user name" or "Work profile".
*/
public static String getUserLabel(Context context, UserInfo info) {
if (info.isManagedProfile()) {
// We use predefined values for managed profiles
return context.getString(R.string.managed_user_title);
}
String name = info != null ? info.name : null;
if (name == null && info != null) {
name = Integer.toString(info.id);
} else if (info == null) {
name = context.getString(R.string.unknown);
}
return context.getResources().getString(R.string.running_process_item_user_label, name);
}
/**
* Return whether or not the user should have a SIM Cards option in Settings.
* TODO: Change back to returning true if count is greater than one after testing.