From 6b2dd6337e61379705c59466776a5e96b2e583cd Mon Sep 17 00:00:00 2001 From: Paul Soulos Date: Thu, 24 Jul 2014 17:17:42 -0700 Subject: [PATCH] Adds getTypeLabel to ContactsContract Event Bug: 16550284 Change-Id: Ie95093a2c9bca2b9ba130dea470c8beef94cd659 --- api/current.txt | 1 + core/java/android/provider/ContactsContract.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/api/current.txt b/api/current.txt index d482260e38076..37f83a678870e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24343,6 +24343,7 @@ package android.provider { } public static final class ContactsContract.CommonDataKinds.Event implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { + method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence); method public static int getTypeResource(java.lang.Integer); field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_event"; field public static final java.lang.String START_DATE = "data1"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index d0dbd96b3d4d1..762e1ee257742 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -6802,6 +6802,21 @@ public final class ContactsContract { default: return com.android.internal.R.string.eventTypeCustom; } } + + /** + * Return a {@link CharSequence} that best describes the given type, + * possibly substituting the given {@link #LABEL} value + * for {@link #TYPE_CUSTOM}. + */ + public static final CharSequence getTypeLabel(Resources res, int type, + CharSequence label) { + if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) { + return label; + } else { + final int labelRes = getTypeResource(type); + return res.getText(labelRes); + } + } } /**