Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0afa207 authored by Brian Attwell's avatar Brian Attwell
Browse files

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
parent f3df4328

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

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ public class CompactContactEditorFragment extends ContactEditorBaseFragment impl 
            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

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ public class PhotoActionPopup { 
                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) {