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

Commit 3695c7c1 authored by Michael W's avatar Michael W
Browse files

Dialer: Bring back merge calls 

* Commit acd66498 removed speakeasy references
* Showing the merge button should ofc not depend on all calls being
  null, so the logic is now "always show merge button if the capability
  is there", as it should be

Test:
- Call someone
- Press "Add call"
- Call someone else
- Merge button is there and makes it a conference

Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/6332
Change-Id: Ifd8f8bc0f82b0b66fa28272e1c18a2467eed8e72
parent a7345076

java/com/android/incallui/CallButtonPresenter.java

+1 −9
Original line number Diff line number Diff line
@@ -480,15 +480,7 @@ public class CallButtonPresenter 


    final boolean showAddCall =

        TelecomAdapter.getInstance().canAddCall() && UserManagerCompat.isUserUnlocked(context);

    // There can only be two calls so don't show the ability to merge when one of them

    // is a speak easy call.

    final boolean showMerge =

        InCallPresenter.getInstance()

                .getCallList()

                .getAllCalls()

                .stream()

                .noneMatch(c -> c != null)

            && call.can(android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);

    final boolean showMerge = call.can(android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);

    final boolean showUpgradeToVideo = !isVideo && (hasVideoCallCapabilities(call));

    final boolean showDowngradeToAudio = isVideo && isDowngradeToAudioSupported(call);

    final boolean showMute = call.can(android.telecom.Call.Details.CAPABILITY_MUTE);