diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-14 02:25:44 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-14 02:25:44 -0700 |
commit | de7dcda2fce55220d6e48ec8717f3094c5b55f8c (patch) | |
tree | 54b0715945f28a295e0c32b00789ec9b4b9e0374 | |
parent | caad46fc20cde665c807d5dff02d04a257d09255 (diff) | |
parent | 9c037ffefefc0e596c514cdf91023d37692042c1 (diff) | |
download | android_packages_apps_ContactsCommon-de7dcda2fce55220d6e48ec8717f3094c5b55f8c.tar.gz android_packages_apps_ContactsCommon-de7dcda2fce55220d6e48ec8717f3094c5b55f8c.tar.bz2 android_packages_apps_ContactsCommon-de7dcda2fce55220d6e48ec8717f3094c5b55f8c.zip |
Merge "Make MaterialPalette parcelable"
-rw-r--r-- | src/com/android/contacts/common/util/MaterialColorMapUtils.java | 32 |
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 ad9721b7..e12422f4 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 { @@ -34,7 +36,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; @@ -71,6 +73,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]; + } + }; } /** |