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

Commit d28ae4e3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge dd6dddf1 on remote branch 

Change-Id: I439e0f8cb948e86351fa96d3be5ced5a222694d2
parents 7591b326 dd6dddf1

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;

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

+2 −2
Original line number Diff line number Diff line
@@ -309,8 +309,8 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD 
        InCallPresenter.getInstance().setThemeColors();

        InCallPresenter.getInstance().onUiShowing(true);



        // Clear fullscreen state onResume; the stored value may not match reality.

        InCallPresenter.getInstance().clearFullscreen();

        // Exit fullscreen state onResume; the stored value may not match reality.

        InCallPresenter.getInstance().setFullScreen(false);



        // If there is a pending request to show or hide the dialpad, handle that now.

        if (mShowDialpadRequest != DIALPAD_REQUEST_NONE) {

src/com/android/dialer/dialpad/DialpadFragment.java

+11 −10
Original line number Diff line number Diff line
@@ -2075,7 +2075,8 @@ public class DialpadFragment extends Fragment 
            requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION},

                    PERMISSION_REQUEST_CODE_LOCATION);

        } else {

            if(WifiCallUtils.shallShowWifiCallDialog(getActivity())) {

            if (!PhoneNumberUtils.isEmergencyNumber(mDigits.getText().toString()) &&

                    WifiCallUtils.shallShowWifiCallDialog(getActivity())) {

                WifiCallUtils.showWifiCallDialog(getActivity());

                WifiCallUtils.showWifiCallNotification(getActivity());

            } else {