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

Commit 76e3ee4c authored by Naveen Kumar's avatar Naveen Kumar
Browse files

Merge commit '03ebc3fe' into remote 

Conflicts:
	src/com/android/dialer/SpeedDialListActivity.java
	src/com/android/dialer/dialpad/DialpadFragment.java

Change-Id: Ied8029752b8452f4848a9ef5347a12a89db3a7ee
parents 2b7b529d 03ebc3fe

InCallUI/res/values-zh-rCN/qtistrings.xml

+100 −0
Original line number Diff line number Diff line
@@ -47,4 +47,104 @@ 
    <string name="modify_call_option_vt_tx">视频发送</string>

    <string name="modify_call_option_vt_rx">视频接收</string>

    <string name="modify_call_option_voice">仅限语音</string>

    <!-- Call substate label -->

    <string name="call_substate_label">" 通话质量不佳 - \u000a"</string>

    <!-- Call substate label for call resumed -->

    <string name="call_substate_call_resumed">"通话继续\u000a"</string>

    <!-- Call substate label for call connected suspended (audio) -->

    <string name="call_substate_connected_suspended_audio">"暂停连接\u000a"</string>

    <!-- Call substate label for call connected suspended (video) -->

    <string name="call_substate_connected_suspended_video">"视频电话暂停\u000a"</string>

    <!-- Call substate label for avp retry -->

    <string name="call_substate_avp_retry">"AVP 重试\u000a"</string>

    <!-- Video quality changed message -->

    <string name="video_quality_changed">" 视频画质变为\u0020"</string>

    <!-- Video quality High -->

    <string name="video_quality_high">"高画质"</string>

    <!-- Video quality Medium -->

    <string name="video_quality_medium">"中画质"</string>

    <!-- Video quality Low -->

    <string name="video_quality_low">"低画质"</string>

    <!-- Video quality Unknown -->

    <string name="video_quality_unknown">"未知"</string>

    <!-- Message indicating that Video Started flowing for IMS-VT calls -->

    <string name="player_started">"播放器已启动"</string>

    <!-- Message indicating that Video Stopped flowing for IMS-VT calls -->

    <string name="player_stopped">"播放暂停"</string>

    <!-- Message indicating that camera failure has occurred for the selected camera and

         as result camera is not ready -->

    <string name="camera_not_ready">"摄像头故障"</string>

    <!-- Message indicating that camera is ready/available -->

    <string name="camera_ready">"摄像头就绪"</string>

    <!-- Message indicating unknown call session event -->

    <string name="unknown_call_session_event">"未知电话"</string>

    <!-- Message indicating data usage -->

    <string name="data_usage_label">"流量使用： "</string>

    <!-- Modify call error cause -->

    <string name="modify_call_failed_due_to_low_battery">"由于电池电量不足，无法修改通话。"</string>

    <!-- Message indicating video calls not allowed if user enabled TTY Mode -->

    <string name="video_call_not_allowed_if_tty_enabled">"请关闭 TTY 模式以便升级到视频电话。"</string>

    <!-- Text for the onscreen "Add Participant" button -->

    <string name="onscreenAddParticipant">"添加参与者"</string>

    <!-- Description of the deflect target in the Slide unlock screen. [CHAR LIMIT=NONE] -->

    <string name="qti_description_target_deflect">"转移"</string>

    <string name="qti_description_deflect_error">"号码未设置。通过 IMS 设置提供号码，然后重试。"</string>

    <string name="qti_description_deflect_service_error">"不支持呼叫转移服务。"</string>

    <!-- Message indicating call failed due to handover not feasible -->

    <string name="call_failed_ho_not_feasible">"无法从 LTE 切换到 3G/2G，通话已结束。"</string>

    <!-- Title of the IMS to CS redial dialog -->

    <string name="cs_redial_option">"重拨选项"</string>

    <!-- Message text of the IMS to CS redial dialog -->

    <string name="cs_redial_msg">"无法拨打 IMS 视频通话，是否要拨打非 IMS 的语音通话？"</string>

    <!-- Yes option of the IMS to CS redial dialog -->

    <string name="cs_redial_yes">"是"</string>

    <!-- No option of the IMS to CS redial dialog -->

    <string name="cs_redial_no">"否"</string>

    <!-- Session modify cause unspecified -->

    <string name="session_modify_cause_unspecified"></string>

    <!-- Session modify cause code upgrade local request -->

    <string name="session_modify_cause_upgrade_local_request">"应用户请求，通话已升级"</string>

    <!-- Session modify cause code upgrade remote request -->

    <string name="session_modify_cause_upgrade_remote_request">"应远程用户请求，通话已升级"</string>

    <!-- Session modify cause code downgrade local request -->

    <string name="session_modify_cause_downgrade_local_request">"应用户请求，通话已降级"</string>

    <!-- Session modify cause code downgrade remote request -->

    <string name="session_modify_cause_downgrade_remote_request">"应远程用户请求，通话已降级"</string>

    <!-- Session modify cause code downgrade rtp timeout -->

    <string name="session_modify_cause_downgrade_rtp_timeout">"由于 RTP 超时，通话已降级"</string>

    <!-- Session modify cause code downgrade qos -->

    <string name="session_modify_cause_downgrade_qos">"由于服务质量，通话已降级"</string>

    <!-- Session modify cause code downgrade packet loss -->

    <string name="session_modify_cause_downgrade_packet_loss">"由于数据包丢失，通话已降级"</string>

    <!-- Session modify cause code downgrade low thrput -->

    <string name="session_modify_cause_downgrade_low_thrput">"由于吞吐量低，通话已降级"</string>

    <!-- Session modify cause code downgrade thermal mitigation -->

    <string name="session_modify_cause_downgrade_thermal_mitigation">"由于设备过热，通话已降级"</string>

    <!-- Session modify cause code downgrade lipsync -->

    <string name="session_modify_cause_downgrade_lipsync">"由于嘴唇同步功能，通话已降级"</string>

    <!-- Session modify cause code downgrade generic error -->

    <string name="session_modify_cause_downgrade_generic_error">"由于一般错误，通话已降级"</string>

    <!-- Title for low battery alert dialogue -->

    <string name="low_battery">"电池电量不足"</string>

    <!-- Yes option of the low battery alert dialog -->

    <string name="low_battery_yes">"是"</string>

    <!-- No option of the low battery alert dialog -->

    <string name="low_battery_no">"否"</string>

    <!-- Message text of the low battery alert dialog in cases when video call can be downgraded to voice call -->

    <string name="low_battery_downgrade_to_voice_msg">"要将视频通话转换为音频通话吗？"</string>

    <!-- Message text of the low battery alert dialog in cases video call doesn't have downgrade capabilities -->

    <string name="low_battery_hangup_msg">"要挂断电话吗？"</string>

    <!-- Description of the call transfer related strings [CHAR LIMIT=NONE] -->

    <string name="qti_ims_transfer_num_error">"号码未设置。通过 IMS 设置提供号码，然后重试。"</string>

    <string name="qti_ims_transfer_request_error">"呼叫转移请求失败。"</string>

    <string name="qti_ims_transfer_request_success">"呼叫转移请求成功。"</string>

    <!-- Text for the onscreen "blind transfer" button -->

    <string name="qti_ims_onscreenBlindTransfer">"无条件转移"</string>

    <!-- Text for the onscreen "assured transfer" button -->

    <string name="qti_ims_onscreenAssuredTransfer">"固定转移"</string>

    <!-- Text for the onscreen "consultative transfer" button -->

    <string name="qti_ims_onscreenConsultativeTransfer">"询问转移"</string>

    <!-- Text for operator specific emergency number -->

    <add-resource type="string" name="emergency_call_dialog_number_for_display_operator"/>

    <string name="emergency_call_dialog_number_for_display_operator">"紧急呼救"</string>

</resources>

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

+7 −5
Original line number Diff line number Diff line
@@ -300,11 +300,13 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto 
    }



    public void addCallClicked() {

        if (!QtiImsExtUtils.isCarrierOneSupported()) {

            // Automatically mute the current call

            mAutomaticallyMuted = true;

            mPreviousMuteState = AudioModeProvider.getInstance().getMute();

            // Simulate a click on the mute button

            muteClicked(true);

        }

        TelecomAdapter.getInstance().addCall();

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -1160,6 +1160,15 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> 
        // No-op - the Call Card is the origin of this event.

    }



    @Override

    public void onIncomingVideoAvailabilityChanged(boolean isAvailable) {

        Log.d(this, "onIncomingVideoAvailabilityChanged: available = " + isAvailable);

        if (mPrimary == null) {

            return;

        }

        updatePrimaryDisplayInfo();

    }



    private boolean isPrimaryCallActive() {

        return mPrimary != null && mPrimary.getState() == Call.State.ACTIVE;

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD 
        // TODO(klp): Do we need to add this back when prox sensor is not available?

        // lp.inputFeatures |= WindowManager.LayoutParams.INPUT_FEATURE_DISABLE_USER_ACTIVITY;



        // Since activity is created newly, clear full screen flag. This will ensure that

        // the flag is in sync with actual UI when UI is recreated due to orientation change.

        InCallPresenter.getInstance().clearFullscreen();



        setContentView(R.layout.incall_screen);



        internalResolveIntent(getIntent());

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

+16 −15
Original line number Diff line number Diff line
@@ -330,6 +330,11 @@ public class InCallPresenter implements CallList.Listener, 
        mProximitySensor = proximitySensor;

        addListener(mProximitySensor);



        // dismiss any pending dialogues related to earlier call, which

        // are no longer relevant now.

        if (isActivityStarted()) {

            mInCallActivity.dismissPendingDialogs();

        }

        addIncomingCallListener(mAnswerPresenter);

        addInCallUiListener(mAnswerPresenter);

        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
@@ -702,6 +707,7 @@ public class InCallPresenter implements CallList.Listener, 
        if (CallList.getInstance().isDsdaEnabled() && (mInCallActivity != null)) {

            mInCallActivity.updateDsdaTab();

        }

        wakeUpScreen();

    }



    @Override
@@ -1375,6 +1381,15 @@ public class InCallPresenter implements CallList.Listener, 
        }

    }



    /**

     * Called by the {@link VideoCallPresenter} to inform of a change in availability of

     * incoming video stream.

     */

    public void notifyIncomingVideoAvailabilityChanged(boolean isAvailable) {

        for (InCallEventListener listener : mInCallEventListeners) {

            listener.onIncomingVideoAvailabilityChanged(isAvailable);

        }

    }



    /**

     * For some disconnected causes, we show a dialog.  This calls into the activity to show
@@ -1867,21 +1882,6 @@ public class InCallPresenter implements CallList.Listener, 
        }

    }



    public void enableScreenTimeout(boolean enable) {

        Log.v(this, "enableScreenTimeout: value=" + enable);

        if (mInCallActivity == null) {

            Log.e(this, "enableScreenTimeout: InCallActivity is null.");

            return;

        }



        final Window window = mInCallActivity.getWindow();

        if (enable) {

            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

        } else {

            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

        }

    }



    /**

     * Returns the space available beside the call card.

     *
@@ -2100,6 +2100,7 @@ public class InCallPresenter implements CallList.Listener, 
        public void onFullscreenModeChanged(boolean isFullscreenMode);

        public void onSecondaryCallerInfoVisibilityChanged(boolean isVisible, int height);

        public void updatePrimaryCallState();

        public void onIncomingVideoAvailabilityChanged(boolean isAvailable);

    }



    public interface InCallUiListener {