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

Commit b41fe30c authored by Walter Jang's avatar Walter Jang
Browse files

Hide "Remove contacts" menu item for empty groups 

Bug 30369711

Change-Id: I0e80955a3ea657e2bac67c7e39ae4b2755badae5
parent b4e7e9fe

src/com/android/contacts/activities/GroupMembersActivity.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -336,13 +336,19 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements 
        setVisible(menu, R.id.menu_add, isGroupEditable && !isSelectionMode);

        setVisible(menu, R.id.menu_add, isGroupEditable && !isSelectionMode);

        setVisible(menu, R.id.menu_rename_group, !isGroupReadOnly && !isSelectionMode);

        setVisible(menu, R.id.menu_rename_group, !isGroupReadOnly && !isSelectionMode);

        setVisible(menu, R.id.menu_delete_group, !isGroupReadOnly && !isSelectionMode);

        setVisible(menu, R.id.menu_delete_group, !isGroupReadOnly && !isSelectionMode);

        setVisible(menu, R.id.menu_edit_group, isGroupEditable && !mIsEditMode && !isSelectionMode);

        setVisible(menu, R.id.menu_edit_group, isGroupEditable && !mIsEditMode && !isSelectionMode

                && !isGroupEmpty());

        setVisible(menu, R.id.menu_remove_from_group, isGroupEditable && isSelectionMode &&

        setVisible(menu, R.id.menu_remove_from_group, isGroupEditable && isSelectionMode &&

                !mIsEditMode);

                !mIsEditMode);





        return true;

        return true;

    }

    }





    private boolean isGroupEmpty() {

        return mMembersFragment != null && mMembersFragment.getAdapter() != null &&

                mMembersFragment.getAdapter().isEmpty();

    }



    private static void setVisible(Menu menu, int id, boolean visible) {

    private static void setVisible(Menu menu, int id, boolean visible) {

        final MenuItem menuItem = menu.findItem(id);

        final MenuItem menuItem = menu.findItem(id);

        if (menuItem != null) {

        if (menuItem != null) {