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

am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev

Browse Source 
* commit 'b1322a2a11b3475f2f657674d83b98884c308c09':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
This commit is contained in:
Tingting Wang
2015-07-17 19:00:43 +00:00
committed by Android Git Automerger
parent f4d5fa93bb b1322a2a11
commit cee004330e
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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