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

Commit 04e6b557 authored by Katherine Kuan's avatar Katherine Kuan
Browse files

Show edit group option for default auto-added Focus groups 

- Focus groups like "Friends", "Family", and "Coworkers" are read-only
because their titles are read-only and they cannot be deleted, but
their membership can still be editable, so show the "edit group"
option.

- Fix bug with editable Google+ circles were editable by adding a
missing dataset field

Bug: 5250453

Change-Id: I3c5590a01bf641fb22e97fdba4a4eb3c41725e6c
parent ea0a8a2f

res/layout-sw580dp/group_detail_fragment.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/background_primary"

    android:paddingLeft="@dimen/group_detail_border_padding"

    android:paddingRight="@dimen/group_detail_border_padding">

src/com/android/contacts/group/GroupDetailFragment.java

+6 −7
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class GroupDetailFragment extends Fragment implements OnScrollListener { 
    private boolean mIsReadOnly;



    private boolean mShowGroupActionInActionBar;

    private boolean mOptionsMenuEditable;

    private boolean mOptionsMenuGroupDeletable;

    private boolean mOptionsMenuGroupPresent;

    private boolean mCloseActivityAfterDelete;
@@ -386,11 +386,11 @@ public class GroupDetailFragment extends Fragment implements OnScrollListener { 
    }



    public boolean isOptionsMenuChanged() {

        return mOptionsMenuEditable != isGroupEditable() &&

        return mOptionsMenuGroupDeletable != isGroupDeletable() &&

                mOptionsMenuGroupPresent != isGroupPresent();

    }



    public boolean isGroupEditable() {

    public boolean isGroupDeletable() {

        return mGroupUri != null && !mIsReadOnly;

    }
@@ -400,15 +400,14 @@ public class GroupDetailFragment extends Fragment implements OnScrollListener { 


    @Override

    public void onPrepareOptionsMenu(Menu menu) {

        mOptionsMenuEditable = isGroupEditable() && isVisible();

        mOptionsMenuGroupDeletable = isGroupDeletable() && isVisible();

        mOptionsMenuGroupPresent = isGroupPresent() && isVisible();



        // Editing is not possible for read only groups

        final MenuItem editMenu = menu.findItem(R.id.menu_edit_group);

        editMenu.setVisible(mOptionsMenuGroupPresent && mOptionsMenuEditable);

        editMenu.setVisible(mOptionsMenuGroupPresent);



        final MenuItem deleteMenu = menu.findItem(R.id.menu_delete_group);

        deleteMenu.setVisible(mOptionsMenuEditable);

        deleteMenu.setVisible(mOptionsMenuGroupDeletable);

    }



    @Override

src/com/android/contacts/group/GroupEditorFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ public class GroupEditorFragment extends Fragment implements SelectAccountDialog 
        mOriginalGroupName = cursor.getString(GroupMetaDataLoader.TITLE);

        mAccountName = cursor.getString(GroupMetaDataLoader.ACCOUNT_NAME);

        mAccountType = cursor.getString(GroupMetaDataLoader.ACCOUNT_TYPE);

        mDataSet = cursor.getString(GroupMetaDataLoader.DATA_SET);

        mGroupNameIsReadOnly = (cursor.getInt(GroupMetaDataLoader.IS_READ_ONLY) == 1);

        setupEditorForAccount();