diff options
-rw-r--r-- | src/com/android/contacts/common/util/MaterialColorMapUtils.java | 36 | ||||
-rw-r--r-- | src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java | 6 |
2 files changed, 38 insertions, 4 deletions
diff --git a/src/com/android/contacts/common/util/MaterialColorMapUtils.java b/src/com/android/contacts/common/util/MaterialColorMapUtils.java index 9c8862c3..ad9721b7 100644 --- a/src/com/android/contacts/common/util/MaterialColorMapUtils.java +++ b/src/com/android/contacts/common/util/MaterialColorMapUtils.java @@ -41,6 +41,36 @@ public class MaterialColorMapUtils { } public final int mPrimaryColor; public final int mSecondaryColor; + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + MaterialPalette other = (MaterialPalette) obj; + if (mPrimaryColor != other.mPrimaryColor) { + return false; + } + if (mSecondaryColor != other.mSecondaryColor) { + return false; + } + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + mPrimaryColor; + result = prime * result + mSecondaryColor; + return result; + } } /** @@ -79,6 +109,12 @@ public class MaterialColorMapUtils { return new MaterialPalette(primaryColor, secondaryColor); } + public static MaterialPalette getDefaultInCallPrimaryAndSecondaryColors(Resources resources) { + final int primaryColor = resources.getColor(R.color.dialer_theme_color); + final int secondaryColor = resources.getColor(R.color.dialer_theme_color_dark); + return new MaterialPalette(primaryColor, secondaryColor); + } + /** * Returns the hue component of a color int. * diff --git a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java index c0bbcce7..773a415f 100644 --- a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java +++ b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java @@ -132,20 +132,18 @@ public class SelectPhoneAccountDialogFragment extends AnalyticsDialogFragment { } private class SelectAccountListAdapter extends ArrayAdapter<PhoneAccountHandle> { - private Context mContext; private int mResId; public SelectAccountListAdapter( Context context, int resource, List<PhoneAccountHandle> accountHandles) { super(context, resource, accountHandles); - mContext = context; mResId = resource; } @Override public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) - mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); View rowView; final ViewHolder holder; @@ -166,7 +164,7 @@ public class SelectPhoneAccountDialogFragment extends AnalyticsDialogFragment { PhoneAccountHandle accountHandle = getItem(position); PhoneAccount account = mTelecomManager.getPhoneAccount(accountHandle); holder.textView.setText(account.getLabel()); - holder.imageView.setImageDrawable(account.getIcon(mContext)); + holder.imageView.setImageDrawable(account.getIcon(getContext())); return rowView; } |