Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev

Browse Source 
* commit '4ccf69e1191244ee104edd74843fc7ae391c5270':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.
This commit is contained in:
Tingting Wang
2015-07-08 20:20:20 +00:00
committed by Android Git Automerger
parent b5501efcdd 4ccf69e119
commit 0f4595afd0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/provider/ContactsContract.java
View File

@@ -5957,7 +5957,9 @@ public final class ContactsContract {
*/ */
public static final CharSequence getTypeLabel(Resources res, int type, public static final CharSequence getTypeLabel(Resources res, int type,
CharSequence label) { CharSequence label) {
if ((type == TYPE_CUSTOM || type == TYPE_ASSISTANT) && !TextUtils.isEmpty(label)) { if (type == TYPE_CUSTOM) {
return (label != null ? label : "");
} else if (type == TYPE_ASSISTANT && !TextUtils.isEmpty(label)) {
return label; return label;
} else { } else {
final int labelRes = getTypeLabelResource(type); final int labelRes = getTypeLabelResource(type);