summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authorIhab Awad <ihab@google.com>2014-10-12 04:33:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-12 04:33:12 +0000
commit6d39d66900744afbd0d4388f1a14c9b47d1f1d1a (patch)
tree46715580dfa525bbc4ddbe02698309fbf0cc40d6 /telecomm/java/android
parentec941de2fc2a96e6924d11de3168c14ae8af1ac4 (diff)
parentf5afb4d617d591225cc504b52ba9b6f1605a5c87 (diff)
downloadframeworks_base-6d39d66900744afbd0d4388f1a14c9b47d1f1d1a.zip
frameworks_base-6d39d66900744afbd0d4388f1a14c9b47d1f1d1a.tar.gz
frameworks_base-6d39d66900744afbd0d4388f1a14c9b47d1f1d1a.tar.bz2
am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)"
* commit 'f5afb4d617d591225cc504b52ba9b6f1605a5c87': Revert "Add color to PhoneAccount objects (1/3)"
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecom/PhoneAccount.java22
1 files changed, 0 insertions, 22 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index 29367b0..062baa5 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -110,7 +110,6 @@ public class PhoneAccount implements Parcelable {
private final Uri mSubscriptionAddress;
private final int mCapabilities;
private final int mIconResId;
- private final int mColor;
private final CharSequence mLabel;
private final CharSequence mShortDescription;
private final List<String> mSupportedUriSchemes;
@@ -121,7 +120,6 @@ public class PhoneAccount implements Parcelable {
private Uri mSubscriptionAddress;
private int mCapabilities;
private int mIconResId;
- private int mColor;
private CharSequence mLabel;
private CharSequence mShortDescription;
private List<String> mSupportedUriSchemes = new ArrayList<String>();
@@ -143,7 +141,6 @@ public class PhoneAccount implements Parcelable {
mSubscriptionAddress = phoneAccount.getSubscriptionAddress();
mCapabilities = phoneAccount.getCapabilities();
mIconResId = phoneAccount.getIconResId();
- mColor = phoneAccount.getColor();
mLabel = phoneAccount.getLabel();
mShortDescription = phoneAccount.getShortDescription();
mSupportedUriSchemes.addAll(phoneAccount.getSupportedUriSchemes());
@@ -169,11 +166,6 @@ public class PhoneAccount implements Parcelable {
return this;
}
- public Builder setColor(int value) {
- this.mColor = value;
- return this;
- }
-
public Builder setShortDescription(CharSequence value) {
this.mShortDescription = value;
return this;
@@ -227,7 +219,6 @@ public class PhoneAccount implements Parcelable {
mSubscriptionAddress,
mCapabilities,
mIconResId,
- mColor,
mLabel,
mShortDescription,
mSupportedUriSchemes);
@@ -240,7 +231,6 @@ public class PhoneAccount implements Parcelable {
Uri subscriptionAddress,
int capabilities,
int iconResId,
- int color,
CharSequence label,
CharSequence shortDescription,
List<String> supportedUriSchemes) {
@@ -249,7 +239,6 @@ public class PhoneAccount implements Parcelable {
mSubscriptionAddress = subscriptionAddress;
mCapabilities = capabilities;
mIconResId = iconResId;
- mColor = color;
mLabel = label;
mShortDescription = shortDescription;
mSupportedUriSchemes = Collections.unmodifiableList(supportedUriSchemes);
@@ -382,15 +371,6 @@ public class PhoneAccount implements Parcelable {
}
/**
- * A highlight color to use in displaying information about this {@code PhoneAccount}.
- *
- * @return A hexadecimal color value.
- */
- public int getColor() {
- return mColor;
- }
-
- /**
* An icon to represent this {@code PhoneAccount} in a user interface.
*
* @return An icon for this {@code PhoneAccount}.
@@ -438,7 +418,6 @@ public class PhoneAccount implements Parcelable {
out.writeParcelable(mSubscriptionAddress, 0);
out.writeInt(mCapabilities);
out.writeInt(mIconResId);
- out.writeInt(mColor);
out.writeCharSequence(mLabel);
out.writeCharSequence(mShortDescription);
out.writeList(mSupportedUriSchemes);
@@ -465,7 +444,6 @@ public class PhoneAccount implements Parcelable {
mSubscriptionAddress = in.readParcelable(getClass().getClassLoader());
mCapabilities = in.readInt();
mIconResId = in.readInt();
- mColor = in.readInt();
mLabel = in.readCharSequence();
mShortDescription = in.readCharSequence();