am b5550a65: am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

* commit 'b5550a65c089f230a58b636c9a55c61a054d169b':
  Disambiguate categories in Settings > Trusted Credentials
This commit is contained in:
Zoltan Szatmary-Ban
2014-10-01 18:56:50 +00:00
committed by Android Git Automerger

View File

@@ -316,7 +316,11 @@ public class TrustedCredentialsSettings extends Fragment {
final TextView title = (TextView) convertView.findViewById(android.R.id.title); final TextView title = (TextView) convertView.findViewById(android.R.id.title);
final UserHandle profile = getGroup(groupPosition); final UserHandle profile = getGroup(groupPosition);
final UserInfo userInfo = mUserManager.getUserInfo(profile.getIdentifier()); final UserInfo userInfo = mUserManager.getUserInfo(profile.getIdentifier());
title.setText(userInfo.name); if (userInfo.isManagedProfile()) {
title.setText(R.string.category_work);
} else {
title.setText(R.string.category_personal);
}
title.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END); title.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
return convertView; return convertView;