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

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

Merge a735960b on remote branch 

Change-Id: I37d8e3173c1a19691d2093075d041faba6a2a3d7
parents 45326d54 a735960b

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

+7 −3
Original line number Diff line number Diff line
@@ -525,10 +525,13 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 
        boolean showRx = false;

        boolean showVolte = false;



        if (mEnhanceEnable && showUpgradeToVideo) {

        if (mEnhanceEnable && hasVideoCallCapabilities(call)) {

            boolean isAudioAndVtCap = (VideoProfile.isAudioOnly(mCall.getVideoState()) &&

                    PresenceHelper.getVTCapability(call.getNumber()));

            showRxTx = (VideoProfile.isReceptionEnabled(mCall.getVideoState()) || isAudioAndVtCap);

            showRxTx = ((VideoProfile.isReceptionEnabled(mCall.getVideoState()) &&

                    !VideoProfile.isBidirectional(mCall.getVideoState())) || isAudioAndVtCap);

            //"hide me" show be show if call is video call or voice call only, "hide me"

            //is mean that call can upgrade to Rx video call for voice call only.

            showRx = (VideoProfile.isBidirectional(mCall.getVideoState()) || isAudioAndVtCap);

            showVolte = VideoProfile.isVideo(mCall.getVideoState());

            Log.v(this, "updateButtonsState showRxTx = " + showRxTx +
@@ -544,7 +547,8 @@ 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 && !useCustomVideoUi);

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

                !mEnhanceEnable);

        ui.showButton(BUTTON_DIALPAD, true);

        ui.showButton(BUTTON_MERGE, showMerge);

        ui.showButton(BUTTON_ADD_PARTICIPANT, showAddParticipant && !mEnhanceEnable);

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

+11 −2
Original line number Diff line number Diff line
@@ -104,7 +104,12 @@ public class GlowPadAnswerFragment extends AnswerFragment { 
                handleDrawableResourceId = R.drawable.ic_incall_audio_handle;

                break;

            case TARGET_SET_FOR_VIDEO_WITHOUT_SMS:

                if (isEnhanceUIEnabled) {

                    targetResourceId =

                            R.array.enhance_incoming_call_widget_video_without_sms_targets;

                } else {

                    targetResourceId = R.array.incoming_call_widget_video_without_sms_targets;

                }

                targetDescriptionsResourceId =

                        R.array.incoming_call_widget_video_without_sms_target_descriptions;

                directionDescriptionsResourceId =
@@ -112,7 +117,11 @@ public class GlowPadAnswerFragment extends AnswerFragment { 
                handleDrawableResourceId = R.drawable.ic_incall_video_handle;

                break;

            case TARGET_SET_FOR_VIDEO_WITH_SMS:

                if (isEnhanceUIEnabled) {

                    targetResourceId = R.array.enhance_incoming_call_widget_video_with_sms_targets;

                } else {

                    targetResourceId = R.array.incoming_call_widget_video_with_sms_targets;

                }

                targetDescriptionsResourceId =

                        R.array.incoming_call_widget_video_with_sms_target_descriptions;

                directionDescriptionsResourceId =

res/values/qtistrings.xml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (c) 2016, The Linux Foundation. All rights reserved.

  ~

  ~ Redistribution and use in source and binary forms, with or without

  ~ modification, are permitted provided that the following conditions are

  ~ met:

  ~     * Redistributions of source code must retain the above copyright

  ~       notice, this list of conditions and the following disclaimer.

  ~     * Redistributions in binary form must reproduce the above

  ~       copyright notice, this list of conditions and the following

  ~       disclaimer in the documentation and/or other materials provided

  ~       with the distribution.

  ~     * Neither the name of The Linux Foundation nor the names of its

  ~       contributors may be used to endorse or promote products derived

  ~       from this software without specific prior written permission.

  ~

  ~ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

  ~ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

  ~ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

  ~ ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

  ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

  ~ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

  ~ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

  ~ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

  ~ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

  ~ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

  ~ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  -->

<!-- The xml contains Qti specific resource strings neede for any value added features. -->

<resources>

    <!-- OEM Key strings -->

    <string name="oem_key_code_action"></string>

    <string name="oem_code"></string>

</resources>

res/values/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,8 @@ e mode.</string> 
    <string name="call_data_info_description">Voice call usage time and data usage time</string>

    <string name="alert_call_over_wifi">Calls will be made over Wi-Fi.</string>

    <string name="alert_call_no_cellular_coverage">No cellular network available. Connect to available Wi-Fi to make calls.</string>

    <string name="alert_user_connect_to_wifi_for_call">Connect to Wi-Fi to make calls.</string>

    <string name="alert_user_connect_to_wifi_for_call">Connect to Wi-Fi to make calls</string>

    <string name="alert_user_connect_to_wifi_for_call_text">Tap here to view available networks</string>

    <string name="missing_account_type">(No type)</string>

    <string name="missing_account_name">(No name)</string>

</resources>

src/com/android/dialer/DialtactsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
    }



    private void showVideoCallWelcomeDialog() {

        if (DialerUtils.canShowWelcomeScreen(this)) {

        if (DialerUtils.canShowWelcomeScreen(this) || DialerUtils.isFirstLaunch(this)) {

            final Intent intent = new Intent(this, VideoCallWelcomeActivity.class);

            startActivity(intent);

        }