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

Commit 60773816 authored by cdu's avatar cdu Committed by Matt Garnes
Browse files

CSVT: Enable CSVT function. 

Add entry in Dialpad/CallLog.

Change-Id: I35a56ca69d2b2aa9fc5661d78bd9c6c71584cc15
parent 42569f1a

res/menu/call_details_options.xml

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 
     limitations under the License.

-->

<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/menu_video_call"

        android:showAsAction="withText"

        android:title="@string/video_call"

        android:onClick="onMenuVideoCall"

    />

    <item

        android:id="@+id/menu_ip_call_by_slot1"

        android:showAsAction="withText"

res/menu/dialpad_options.xml

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
     limitations under the License.

-->

<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/menu_video_call"

        android:title="@string/video_call"

        android:showAsAction="withText" />

    <item

        android:id="@+id/menu_ip_call_by_slot1"

        android:showAsAction="withText" />

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ 
    <string name="menu_show_all_calls">Show all calls</string>



    <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] -->

    <string name="video_call">Video call</string>

    <string name="add_contact">Add to contacts</string>

    <string name="add_2sec_pause">Add 2-sec pause</string>

    <string name="add_wait">Add wait</string>

src/com/android/dialer/CallDetailActivity.java

+10 −0
Original line number Diff line number Diff line
@@ -737,6 +737,8 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
        menu.findItem(R.id.menu_edit_number_before_call).setVisible(mHasEditNumberBeforeCallOption);

        menu.findItem(R.id.menu_trash).setVisible(mHasTrashOption);



        menu.findItem(R.id.menu_video_call).setVisible(CallUtil.isCSVTEnabled());



        menu.findItem(R.id.menu_ip_call_by_slot1).setVisible(mHasSub1IpCallOption);

        menu.findItem(R.id.menu_ip_call_by_slot2).setVisible(mHasSub2IpCallOption);
@@ -754,6 +756,14 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe 
        return super.onPrepareOptionsMenu(menu);

    }



    public void onMenuVideoCall(MenuItem menuItem) {

        if (CallUtil.isCSVTEnabled()) {

            startActivity(CallUtil.getCSVTCallIntent(mNumber));

        } else if (false) {

            //add support for ims video call;

        }

    }



    public void onMenuIpCallBySlot1(MenuItem menuItem) {

        String prefix = MoreContactUtils.getIPCallPrefix(this, PhoneConstants.SUB1);

        if (!TextUtils.isEmpty(prefix)) {

src/com/android/dialer/DialtactsActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 


    @Override

    public void onCallNumberDirectly(String phoneNumber, boolean isVideoCall) {

        if (isVideoCall && CallUtil.isCSVTEnabled()){

            this.startActivity(CallUtil.getCSVTCallIntent(phoneNumber));

            mClearSearchOnPause = true;

            return;

        }

        Intent intent = isVideoCall ?

                CallUtil.getVideoCallIntent(phoneNumber, getCallOrigin()) :

                CallUtil.getCallIntent(phoneNumber, getCallOrigin());