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

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

Promotion of atel.lnx.2.0-00015. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1065725   I5d7e5aeff1482d1df663718c02a2bf1f0203c5bf   Fix active call InCallUI buttons highlight when EM call
1002286   I0c242d40a3d254b150ebeef354761fa67b17296f   IMS-VT: Remove one directional video call support
1060450   I66b02bde20e611a57bf43bfe32238e5b30586bd9   Dialer: add several simplized Chinese strings for Dialer
1001730   I7dfc33ea6335c4c7b6eb41d5793d63a23968183c   InCallUI: Config to control call record feature
962058   If25bcc546a299ef70343b409dbd6590d1655892a   Dialer: Input ,(pause) or ;(wait) when long press * or #
1064403   I16b9d7fa5319482c6755a590089c2c0a772aec2d   Using Setting provider to get WiFi call configuration in
1007015   I733385bb78a5f7092d16ae351f57a1f7c02ee9e5   Dialer:phone interface has highlight when receive a BT r

Change-Id: I34a68be4d0a441e84f37fd8db628c1a1b15f7d2c
CRs-Fixed: 1064403, 1007015, 962058, 1002286, 1065725, 1060450, 1001730
parents c4301403 3698a104

InCallUI/res/values/qticonfig.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
  ~ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  -->

<resources>

    <!-- Determines UI extensions for video calls should be used. -->

    <bool name="video_call_use_ext">true</bool>

    <!-- Config to show/hide Video quality toast -->

    <bool name="config_display_video_quality_toast">true</bool>

    <!-- Config to show/hide call session event toast like player start/stop -->
@@ -56,4 +54,6 @@ 
    <bool name="config_enable_modify_call_preview">false</bool>

    <!-- Config to show/hide HD Icon2 -->

    <bool name="config_show_hd2">false</bool>

    <!-- Config to enalbe call record -->

    <bool name="enable_call_record">false</bool>

</resources>

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

+28 −7
Original line number Diff line number Diff line
@@ -316,6 +316,11 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 


        VideoProfile videoProfile = new VideoProfile(VideoProfile.STATE_AUDIO_ONLY);

        videoCall.sendSessionModifyRequest(videoProfile);



        if (QtiCallUtils.useCustomVideoUi(getUi().getContext())) {

            InCallAudioManager.getInstance().onModifyCallClicked(mCall,

                    VideoProfile.STATE_AUDIO_ONLY);

        }

    }



    public void showDialpadClicked(boolean checked) {
@@ -341,6 +346,11 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 
        VideoProfile videoProfile = new VideoProfile(currUnpausedVideoState);

        videoCall.sendSessionModifyRequest(videoProfile);

        mCall.setSessionModificationState(Call.SessionModificationState.WAITING_FOR_RESPONSE);



        if (QtiCallUtils.useCustomVideoUi(context)) {

            InCallAudioManager.getInstance().onModifyCallClicked(mCall,

                    currUnpausedVideoState);

        }

    }



    public void changeToVideo(int videoState) {
@@ -481,17 +491,27 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 
        final boolean showMerge = call.can(

                android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);

        final boolean useExt = QtiCallUtils.useExt(ui.getContext());



        final boolean useCustomVideoUi =

                QtiCallUtils.useCustomVideoUi(ui.getContext());

        final boolean isCallActive = call.getState() == Call.State.ACTIVE;

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

                || (useExt && QtiCallUtils.hasVoiceOrVideoCapabilities(call)

                && (isCallActive || isCallOnHold));



        final boolean showUpgradeToVideo =

                /* When useExt is true, show upgrade button for an active/held

                   call if the call has either voice or video capabilities */

                ((useExt && QtiCallUtils.hasVoiceOrVideoCapabilities(call)) ||

                /* When useCustomVideoUi is true, show upgrade button for an active/held

                   voice call only if the current call has video capabilities */

                (useCustomVideoUi && !isVideo && hasVideoCallCapabilities(call))

                && (isCallActive || isCallOnHold)) ||

                /* When useExt and custom UI are false, default to Google behaviour */

                (!isVideo && !useExt && !useCustomVideoUi && hasVideoCallCapabilities(call));



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

        final int callState = call.getState();



        final boolean showRecord = (callState == Call.State.ACTIVE

                || callState == Call.State.ONHOLD);

        final boolean showRecord = ((callState == Call.State.ACTIVE

                || callState == Call.State.ONHOLD)

                && (ui.getContext().getResources().getBoolean(R.bool.enable_call_record)));



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

        int callTransferCapabilities = call.isEmergencyCall()? 0 : call.getTransferCapabilities();
@@ -524,7 +544,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 
        ui.showButton(BUTTON_UPGRADE_TO_VIDEO, showUpgradeToVideo && !mEnhanceEnable);

        ui.showButton(BUTTON_DOWNGRADE_TO_AUDIO, showDowngradeToAudio && !useExt);

        ui.showButton(BUTTON_SWITCH_CAMERA, isVideo);

        ui.showButton(BUTTON_PAUSE_VIDEO, isVideo && !useExt);

        ui.showButton(BUTTON_PAUSE_VIDEO, isVideo && !useExt && !useCustomVideoUi);

        ui.showButton(BUTTON_DIALPAD, true);

        ui.showButton(BUTTON_MERGE, showMerge);

        ui.showButton(BUTTON_ADD_PARTICIPANT, showAddParticipant && !mEnhanceEnable);
@@ -552,6 +572,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 
        }



        ui.updateButtonStates();

        ui.updateColors();

    }



    private boolean hasVideoCallCapabilities(Call call) {

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

+1 −0
Original line number Diff line number Diff line
@@ -931,6 +931,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr 
            mCallStateIcon.setAlpha(0.0f);

            mCallStateIcon.setVisibility(View.GONE);

        }

        mCallStateIcon.requestLayout();



        if (VideoUtils.isVideoCall(videoState)

                || (state == Call.State.ACTIVE && sessionModificationState

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

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> 
        return null;

    }



    private void updatePrimaryCallState() {

    public void updatePrimaryCallState() {

        if (getUi() != null && mPrimary != null) {

            boolean isWorkCall = mPrimary.hasProperty(PROPERTY_ENTERPRISE_CALL)

                    || (mPrimaryContactInfo == null ? false

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

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD 
        if (mShowPostCharWaitDialogOnResume) {

            showPostCharWaitDialog(mShowPostCharWaitDialogCallId, mShowPostCharWaitDialogChars);

        }

        InCallPresenter.getInstance().updatePrimaryCallState();

    }



    // onPause is guaranteed to be called when the InCallActivity goes