commit 7ab14cbdb81cbb62c31db4102d1107d61a3823f3
author Walter Jang <wjang@google.com> Mon Oct 26 20:48:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 26 20:48:47 2015 +0000
tree cb522dcdaa0a0ccb29c49d059d811be102e7342d
parent 13aede84cf83a9fb4bfb2f28eb77429b3b43169d
parent 2c7fdac948e7b815ff5ef3a6989b8f1f4eeba323

Merge "Don't skip pending check when save to account changed" into ub-contactsdialer-a-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20c4419..5416672 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,7 +271,10 @@
     <string name="savingContact">Saving contact\u2026</string>
 
     <!-- Toast displayed when a contact is saved [CHAR LIMIT=NONE] -->
-    <string name="contactSavedToast">Contact saved.</string>
+    <string name="contactSavedToast">Contact saved</string>
+
+    <!-- Toast displayed when linked contacts get unlinked [CHAR LIMIT=NONE] -->
+    <string name="contactUnlinkedToast">Contacts unlinked</string>
 
     <!-- Toast displayed when saving a contact failed. [CHAR LIMIT=NONE] -->
     <string name="contactSavedErrorToast">Couldn\'t save contact changes.</string>

src/com/android/contacts/editor/ContactEditorBaseFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index 434e16b..91fc81f 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -1399,9 +1399,18 @@
             Uri contactLookupUri) {
         if (hadChanges) {
             if (saveSucceeded) {
-                if (saveMode != SaveMode.JOIN) {
-                    Toast.makeText(mContext, R.string.contactSavedToast, Toast.LENGTH_SHORT).show();
+                switch (saveMode) {
+                    case SaveMode.JOIN:
+                        break;
+                    case SaveMode.SPLIT:
+                        Toast.makeText(mContext, R.string.contactUnlinkedToast, Toast.LENGTH_SHORT)
+                                .show();
+                        break;
+                    default:
+                        Toast.makeText(mContext, R.string.contactSavedToast, Toast.LENGTH_SHORT)
+                                .show();
                 }
+
             } else {
                 Toast.makeText(mContext, R.string.contactSavedErrorToast, Toast.LENGTH_LONG).show();
             }

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index cb3252f..272bc27 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -632,10 +632,10 @@
 
     private void enableLinkButton() {
         mSuggestionsLinkButton.setClickable(true);
-        mSuggestionsLinkButton.getBackground().setColorFilter(
-                ContextCompat.getColor(this, R.color.primary_color), PorterDuff.Mode.MULTIPLY);
-        mSuggestionsLinkButton.setElevation(6.0f); // reset elevation
-        mSuggestionsLinkButton.setTextColor(getResources().getColor(android.R.color.white, null));
+        mSuggestionsLinkButton.getBackground().setColorFilter(getResources().getColor(
+                R.color.primary_color, getTheme()), PorterDuff.Mode.SRC_ATOP);
+        mSuggestionsLinkButton.setTextColor(getResources().getColor(android.R.color.white,
+                getTheme()));
         mSuggestionsLinkButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -657,11 +657,10 @@
     private void disableLinkButton() {
         mSuggestionsLinkButton.setClickable(false);
         mSuggestionsLinkButton.getBackground().setColorFilter(
-                ContextCompat.getColor(this, R.color.disabled_button_background),
-                PorterDuff.Mode.MULTIPLY);
-        mSuggestionsLinkButton.setElevation(0.0f); // makes it look flat and removed shadow
+                getResources().getColor(R.color.disabled_button_background, getTheme()),
+                PorterDuff.Mode.SRC_ATOP);
         mSuggestionsLinkButton.setTextColor(
-                getResources().getColor(R.color.disabled_button_text, null));
+                getResources().getColor(R.color.disabled_button_text, getTheme()));
     }
 
     private interface ContextMenuIds {