commit 90e74a539d92a59da8ea2994c91bac908e4ac7d4
author Tingting Wang <tingtingw@google.com> Wed Mar 30 03:41:23 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 30 03:41:24 2016 +0000
tree 1d2d0199de0a98f64e118e52712861358ea9e7de
parent 5bf5b1762a31192d4dee513a46d7864327b65422
parent 9deead63f39d6891385b29d8f76c07136d89699a

Merge "Using Proguard to shrink apk size." into nyc-dev

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

diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index dd3067b..cedc443 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -246,9 +246,7 @@
     /** Returns the {@link Photo#PHOTO_FILE_ID} from the given ValuesDelta. */
     public static Long getPhotoFileId(ValuesDelta valuesDelta) {
         if (valuesDelta == null) return null;
-        // 1. There's no "after", we want to obtain the value of Photo.PHOTO_FILE_ID from "before".
-        // 2. There's a "after", we want to obtain the value of Photo.PHOTO_FILE_ID from "after".
-        if (valuesDelta.getAfter().size() == 0 || valuesDelta.getAfter().get(Photo.PHOTO) != null) {
+        if (valuesDelta.getAfter() == null || valuesDelta.getAfter().get(Photo.PHOTO) == null) {
             return valuesDelta.getAsLong(Photo.PHOTO_FILE_ID);
         }
         return null;

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 4d6aa41..5469c2e 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2719,7 +2719,8 @@
 
                         // Send a toast to give feedback to the user that a shortcut to this
                         // contact was added to the launcher.
-                        final String displayName = mContactData.getDisplayName();
+                        final String displayName = shortcutIntent
+                                .getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
                         final String toastMessage = TextUtils.isEmpty(displayName)
                                 ? getString(R.string.createContactShortcutSuccessful_NoName)
                                 : getString(R.string.createContactShortcutSuccessful, displayName);