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

22
src/com/android/settings/applications/RunningState.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.applications;
import com.android.settings.R;
import com.android.settings.Utils;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.ActivityThread;
@@ -31,6 +28,8 @@ import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Drawable.ConstantState;
import android.os.Handler;
@@ -44,6 +43,10 @@ import android.text.format.Formatter;
import android.util.Log;
import android.util.SparseArray;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.drawable.CircleFramedDrawable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -836,17 +839,8 @@ public class RunningState {
userItem.mUser = new UserState();
UserInfo info = mUm.getUserInfo(newItem.mUserId);
userItem.mUser.mInfo = info;
if (info != null) {
userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
}
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);
}
userItem.mUser.mLabel = context.getResources().getString(
R.string.running_process_item_user_label, name);
userItem.mUser.mIcon = Utils.getUserIcon(context, mUm, info);
userItem.mUser.mLabel = Utils.getUserLabel(context, info);
}
newMergedItems.add(userItem);
}