Revert "Revert "Add color to PhoneAccount objects (2/3)""
This reverts commit 5f8eaaee9c50567a4b2714bd28b4ed39b7aac2b7.
We're ready to add color to PhoneAccounts
Change-Id: Ie65a13e565c26ea5e93f0835bb2c4684140455c9
diff --git a/Android.mk b/Android.mk
index b272445..395aacc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PROGUARD_ENABLED := optimization
+LOCAL_PROGUARD_FLAGS := $(proguard.flags)
# Workaround for "local variable type mismatch" error.
LOCAL_DX_FLAGS += --no-locals
diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java
index ab65d15..ecd459a 100644
--- a/src/com/android/server/telecom/PhoneAccountRegistrar.java
+++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java
@@ -91,6 +91,7 @@
private final Context mContext;
private State mState;
+ @VisibleForTesting
public PhoneAccountRegistrar(Context context) {
this(context, FILE_NAME);
}
@@ -773,6 +774,7 @@
private static final String SUBSCRIPTION_ADDRESS = "subscription_number";
private static final String CAPABILITIES = "capabilities";
private static final String ICON_RES_ID = "icon_res_id";
+ private static final String COLOR = "color";
private static final String LABEL = "label";
private static final String SHORT_DESCRIPTION = "short_description";
private static final String SUPPORTED_URI_SCHEMES = "supported_uri_schemes";
@@ -795,6 +797,7 @@
writeTextSafely(SUBSCRIPTION_ADDRESS, o.getSubscriptionAddress(), serializer);
writeTextSafely(CAPABILITIES, Integer.toString(o.getCapabilities()), serializer);
writeTextSafely(ICON_RES_ID, Integer.toString(o.getIconResId()), serializer);
+ writeTextSafely(COLOR, Integer.toString(o.getColor()), serializer);
writeTextSafely(LABEL, o.getLabel(), serializer);
writeTextSafely(SHORT_DESCRIPTION, o.getShortDescription(), serializer);
writeStringList(SUPPORTED_URI_SCHEMES, o.getSupportedUriSchemes(), serializer);
@@ -812,6 +815,7 @@
Uri subscriptionAddress = null;
int capabilities = 0;
int iconResId = 0;
+ int color = 0;
String label = null;
String shortDescription = null;
List<String> supportedUriSchemes = null;
@@ -834,6 +838,9 @@
} else if (parser.getName().equals(ICON_RES_ID)) {
parser.next();
iconResId = Integer.parseInt(parser.getText());
+ } else if (parser.getName().equals(COLOR)) {
+ parser.next();
+ color = Integer.parseInt(parser.getText());
} else if (parser.getName().equals(LABEL)) {
parser.next();
label = parser.getText();
@@ -871,6 +878,7 @@
.setSubscriptionAddress(subscriptionAddress)
.setCapabilities(capabilities)
.setIconResId(iconResId)
+ .setColor(color)
.setShortDescription(shortDescription)
.setSupportedUriSchemes(supportedUriSchemes)
.build();
diff --git a/tests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java b/tests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
index 014c2d2..cd1bbd1 100644
--- a/tests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
+++ b/tests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
@@ -260,6 +260,7 @@
assertEquals(a.getSubscriptionAddress(), b.getSubscriptionAddress());
assertEquals(a.getCapabilities(), b.getCapabilities());
assertEquals(a.getIconResId(), b.getIconResId());
+ assertEquals(a.getColor(), b.getColor());
assertEquals(a.getLabel(), b.getLabel());
assertEquals(a.getShortDescription(), b.getShortDescription());
assertEquals(a.getSupportedUriSchemes(), b.getSupportedUriSchemes());