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

Commit 9c28ccde authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

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

parents 0aba6720 b0afa207

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) {