Revert "Add color to PhoneAccount objects (1/3)"

This reverts commit 0000cd81c84d73d3f878cd581fb89b7ea257a05a.

diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index 26d40e3..1d6d8bc 100644 (file)
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -113,7 +113,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;
@@ -124,7 +123,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>();
@@ -146,7 +144,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());
@@ -172,11 +169,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;
@@ -230,7 +222,6 @@ public class PhoneAccount implements Parcelable {
                     mSubscriptionAddress,
                     mCapabilities,
                     mIconResId,
-                    mColor,
                     mLabel,
                     mShortDescription,
                     mSupportedUriSchemes);
@@ -243,7 +234,6 @@ public class PhoneAccount implements Parcelable {
             Uri subscriptionAddress,
             int capabilities,
             int iconResId,
-            int color,
             CharSequence label,
             CharSequence shortDescription,
             List<String> supportedUriSchemes) {
@@ -252,7 +242,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}.
@@ -433,7 +413,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);
@@ -460,7 +439,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();