summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-11-26 15:21:43 -0800
committerYorke Lee <yorkelee@google.com>2014-11-26 15:21:43 -0800
commit9824b1a62110f2ee9caefa8ede7d213c176ca012 (patch)
tree7c31745f24245d0e806892ba7281b0f89d02f049 /src
parentdd200258fcde2249759950cd5c7c922d3b7eaa46 (diff)
downloadandroid_packages_apps_ContactsCommon-9824b1a62110f2ee9caefa8ede7d213c176ca012.tar.gz
android_packages_apps_ContactsCommon-9824b1a62110f2ee9caefa8ede7d213c176ca012.tar.bz2
android_packages_apps_ContactsCommon-9824b1a62110f2ee9caefa8ede7d213c176ca012.zip
Make MaterialPalette parcelable
Makes it easier to pass it around in intents Bug: 18373617 Change-Id: I16d235b710dc6c0906c60bf936c7e069a086ca6a
Diffstat (limited to 'src')
-rw-r--r--src/com/android/contacts/common/util/MaterialColorMapUtils.java32
1 files changed, 31 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/util/MaterialColorMapUtils.java b/src/com/android/contacts/common/util/MaterialColorMapUtils.java
index 1e44643f..a8fbf421 100644
--- a/src/com/android/contacts/common/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/common/util/MaterialColorMapUtils.java
@@ -20,6 +20,8 @@ import com.android.contacts.common.R;
import android.content.res.Resources;
import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.os.Trace;
public class MaterialColorMapUtils {
@@ -33,7 +35,7 @@ public class MaterialColorMapUtils {
com.android.contacts.common.R.array.letter_tile_colors_dark);
}
- public static class MaterialPalette {
+ public static class MaterialPalette implements Parcelable {
public MaterialPalette(int primaryColor, int secondaryColor) {
mPrimaryColor = primaryColor;
mSecondaryColor = secondaryColor;
@@ -70,6 +72,34 @@ public class MaterialColorMapUtils {
result = prime * result + mSecondaryColor;
return result;
}
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(mPrimaryColor);
+ dest.writeInt(mSecondaryColor);
+ }
+
+ private MaterialPalette(Parcel in) {
+ mPrimaryColor = in.readInt();
+ mSecondaryColor = in.readInt();
+ }
+
+ public static final Creator<MaterialPalette> CREATOR = new Creator<MaterialPalette>() {
+ @Override
+ public MaterialPalette createFromParcel(Parcel in) {
+ return new MaterialPalette(in);
+ }
+
+ @Override
+ public MaterialPalette[] newArray(int size) {
+ return new MaterialPalette[size];
+ }
+ };
}
/**