am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)" (6d39d669) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/PhoneAccount.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -381,15 +370,6 @@ public class PhoneAccount implements Parcelable {
		return mIconResId;
		}

		/**
		* 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.
		*
		@@ -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();