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

Commit 11e8d8f8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Contacts: Control the create RCS group chat entrance in GroupDetailFragment."

parents 517b1a1f abdf60ad

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

+11 −10
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ public class GroupDetailFragment extends Fragment implements OnScrollListener { 
    private boolean mShowGroupActionInActionBar;

    private boolean mOptionsMenuGroupDeletable;

    private boolean mOptionsMenuGroupEditable;

    private boolean mOptionsMenuRcsSupported;

    private boolean mOptionsMenuRcsEnhanceScreenSupported;

    private boolean mCloseActivityAfterDelete;

    private String mGroupMembersPhones;

    private ArrayList<String> mGroupMembersPhonesList = new ArrayList<String>();
@@ -474,6 +476,9 @@ public class GroupDetailFragment extends Fragment implements OnScrollListener { 
    @Override

    public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {

        inflater.inflate(R.menu.view_group, menu);

        mOptionsMenuRcsSupported = RCSUtil.getRcsSupport();

        mOptionsMenuRcsEnhanceScreenSupported = mOptionsMenuRcsSupported

                && RCSUtil.isEnhanceScreenInstalled(mContext);

    }



    public boolean isOptionsMenuChanged() {
@@ -493,16 +498,12 @@ public class GroupDetailFragment extends Fragment implements OnScrollListener { 
    public void onPrepareOptionsMenu(Menu menu) {

        mOptionsMenuGroupDeletable = isGroupDeletable() && isVisible();

        mOptionsMenuGroupEditable = isGroupEditableAndPresent() && isVisible();

        if (RCSUtil.getRcsSupport()) {



        final MenuItem optionsGroupChat = menu.findItem(R.id.menu_create_group_chat);

            optionsGroupChat.setVisible(true);

        optionsGroupChat.setVisible(mOptionsMenuRcsSupported);



        final MenuItem optionsEnhancedscreen = menu.findItem(R.id.menu_enhancedscreen);

            if (RCSUtil.isEnhanceScreenInstalled(mContext)) {

                optionsEnhancedscreen.setVisible(true);

            } else {

                optionsEnhancedscreen.setVisible(false);

            }

        }

        optionsEnhancedscreen.setVisible(mOptionsMenuRcsEnhanceScreenSupported);



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

        editMenu.setVisible(mOptionsMenuGroupEditable);