commit 9c28ccdec3d3371d1bcfb72323c7af66e64c06c8
author Brian Attwell <brianattwell@google.com> Wed May 20 17:29:31 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 20 17:29:33 2015 +0000
tree 204d0aded6c688a10aad29ee43e0d76b5dbb4d00
parent 0aba6720f00ea30a9dac25c5e5653f3b748b3b37
parent b0afa207a16d22f5d220dd2b18db756a0d159e09

Merge "Remove compact PhotoActionPopup's "Remove Photo"" into mnc-dev

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

diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java
index 3c0e6dd..c7d7cac 100644
--- a/src/com/android/contacts/editor/CompactContactEditorFragment.java
+++ b/src/com/android/contacts/editor/CompactContactEditorFragment.java
@@ -273,7 +273,7 @@
             if (accountType.areContactsWritable()) {
                 hasWritableAccountType = true;
                 if (getContent().isWritablePhotoSet()) {
-                    photoMode = PhotoActionPopup.Modes.WRITE_ABLE_PHOTO;
+                    photoMode = PhotoActionPopup.Modes.MULTIPLE_WRITE_ABLE_PHOTOS;
                     break;
                 }
             }

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

diff --git a/src/com/android/contacts/editor/PhotoActionPopup.java b/src/com/android/contacts/editor/PhotoActionPopup.java
index be8db86..4f958f4 100644
--- a/src/com/android/contacts/editor/PhotoActionPopup.java
+++ b/src/com/android/contacts/editor/PhotoActionPopup.java
@@ -62,6 +62,12 @@
                 Flags.REMOVE_PHOTO |
                 Flags.TAKE_OR_PICK_PHOTO |
                 Flags.TAKE_OR_PICK_PHOTO_REPLACE_WORDING;
+        // When the popup represents multiple photos, the REMOVE_PHOTO option doesn't make sense.
+        // The REMOVE_PHOTO option would have to remove all photos. And sometimes some of the
+        // photos are readonly.
+        public static final int MULTIPLE_WRITE_ABLE_PHOTOS =
+                Flags.TAKE_OR_PICK_PHOTO |
+                Flags.TAKE_OR_PICK_PHOTO_REPLACE_WORDING;
     }
 
     public static ArrayList<ChoiceListItem> getChoices(Context context, int mode) {