Remove private references to android.R.styleable
Define these framework attributes in our own attr.xml and use as
necessary
Bug: 6948882
Change-Id: I6862451133844251315dafeffd1921720eeb4964
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 1b483c5..39dc569 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -305,8 +305,8 @@
a.recycle();
- a = getContext().obtainStyledAttributes(android.R.styleable.Theme);
- mSecondaryTextColor = a.getColorStateList(android.R.styleable.Theme_textColorSecondary);
+ a = getContext().obtainStyledAttributes(R.styleable.Theme);
+ mSecondaryTextColor = a.getColorStateList(R.styleable.Theme_android_textColorSecondary);
a.recycle();
mHorizontalDividerHeight = mHorizontalDividerDrawable.getIntrinsicHeight();
diff --git a/src/com/android/contacts/common/model/account/ExternalAccountType.java b/src/com/android/contacts/common/model/account/ExternalAccountType.java
index f6ab375..ae6dda1 100644
--- a/src/com/android/contacts/common/model/account/ExternalAccountType.java
+++ b/src/com/android/contacts/common/model/account/ExternalAccountType.java
@@ -31,6 +31,7 @@
import android.util.Log;
import android.util.Xml;
+import com.android.contacts.common.R;
import com.android.contacts.common.model.dataitem.DataKind;
import com.google.common.annotations.VisibleForTesting;
@@ -362,21 +363,19 @@
parseEditSchema(context, parser, attrs);
} else if (TAG_CONTACTS_DATA_KIND.equals(tag)) {
final TypedArray a = context.obtainStyledAttributes(attrs,
- android.R.styleable.ContactsDataKind);
+ R.styleable.ContactsDataKind);
final DataKind kind = new DataKind();
kind.mimeType = a
- .getString(android.R.styleable.ContactsDataKind_mimeType);
+ .getString(R.styleable.ContactsDataKind_android_mimeType);
final String summaryColumn = a.getString(
- android.R.styleable.ContactsDataKind_summaryColumn);
+ R.styleable.ContactsDataKind_android_summaryColumn);
if (summaryColumn != null) {
// Inflate a specific column as summary when requested
kind.actionHeader = new SimpleInflater(summaryColumn);
}
-
final String detailColumn = a.getString(
- android.R.styleable.ContactsDataKind_detailColumn);
-
+ R.styleable.ContactsDataKind_android_detailColumn);
if (detailColumn != null) {
// Inflate specific column as summary
kind.actionBody = new SimpleInflater(detailColumn);
diff --git a/src/com/android/contacts/common/util/LocalizedNameResolver.java b/src/com/android/contacts/common/util/LocalizedNameResolver.java
index f8d8151..3c21946 100644
--- a/src/com/android/contacts/common/util/LocalizedNameResolver.java
+++ b/src/com/android/contacts/common/util/LocalizedNameResolver.java
@@ -31,6 +31,8 @@
import android.util.Log;
import android.util.Xml;
+import com.android.contacts.common.R;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -118,11 +120,11 @@
String name = parser.getName();
if (type == XmlPullParser.START_TAG && CONTACTS_DATA_KIND.equals(name)) {
final TypedArray typedArray = context.obtainStyledAttributes(attrs,
- android.R.styleable.ContactsDataKind);
+ R.styleable.ContactsDataKind);
try {
// See if a string has been hardcoded directly into the xml
final String nonResourceString = typedArray.getNonResourceString(
- android.R.styleable.ContactsDataKind_allContactsName);
+ R.styleable.ContactsDataKind_android_allContactsName);
if (nonResourceString != null) {
return nonResourceString;
}
@@ -130,7 +132,7 @@
// See if a resource is referenced. We can't rely on getString
// to automatically resolve it as the resource lives in a different package
int id = typedArray.getResourceId(
- android.R.styleable.ContactsDataKind_allContactsName, 0);
+ R.styleable.ContactsDataKind_android_allContactsName, 0);
if (id == 0) return null;
// Resolve the resource Id