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

Commit 89fe08c4 authored by Suresh Koleti's avatar Suresh Koleti Committed by Gerrit - the friendly Code Review server
Browse files

IMS: Grey out merge menu item in more options 

Grey out merge menu item in more options once clicked on merge
menu item to avoid multiple clicks which is leading to crash
in dialer.

Change-Id: I3bc68b7d5ea143632f4ea6b1e7f9a8ca78272986
CRs-Fixed: 1097132
parent 4b63c4cd

InCallUI/src/com/android/incallui/CallButtonFragment.java

+8 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ public class CallButtonFragment 
        } else if (id == R.id.overflowButton) {

            if (mOverflowPopup != null) {

                updateRecordMenu();

                updateMergeCallsMenuItem();

                mOverflowPopup.show();

            }

        } else if (id == R.id.manageVideoCallConferenceButton) {
@@ -317,6 +318,13 @@ public class CallButtonFragment 
        }

    }



    private void updateMergeCallsMenuItem() {

        MenuItem item = mOverflowPopup.getMenu().findItem(BUTTON_MERGE);

        if (item != null) {

            item.setEnabled(mMergeButton.isEnabled());

        }

    }



    public void updateColors() {

        MaterialPalette themeColors = InCallPresenter.getInstance().getThemeColors();

InCallUI/src/com/android/incallui/CallButtonPresenter.java

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,10 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 
    }



    public void mergeClicked() {

        if (mCall == null) {

            return;

        }



        if (getUi().getContext().getResources().getBoolean(

                R.bool.add_multi_participants_enabled)){

            int participantsCount = 0;