Remove compact PhotoActionPopup's "Remove Photo"
The "Remove Photo" option was causing problems. I was able to do the
following:
1) Remove a photo from a read only raw contact
2) Remove a single photo from a contact with multiple photos. This
removes the current photo and arbitrarily picks another photo
to be the current photo
Killing the "Remove Photo" option removes these problems and was
suggested by UX a couple months ago.
Bug: 19697372
Change-Id: I266b4bf671216f6c1a57e3954a0387a01c0c9574
diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java
index 2bffc6a..037ac8e 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;
}
}
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) {