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

Commit cb43780f authored by Devci Telephony's avatar Devci Telephony Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I6dd82ca9,I310bcbf0 into atel.lnx.2.0-dev 

* changes:
  Dialer: Add call/data usage Timer in Dialer setting
  InCallUI: customize video call UI
parents 6ef60967 13d8b4a7

InCallUI/res/layout/call_button_fragment.xml

+18 −0
Original line number Diff line number Diff line
@@ -197,6 +197,24 @@ 
            android:contentDescription="@string/onscreenManageConferenceText"

            android:visibility="gone" />



        <ImageButton android:id="@+id/rxtxVideoCallButton"

            style="@style/InCallButton"

            android:background="@drawable/btn_change_to_video"

            android:contentDescription="@string/overflowBothCallMenuItemText"

            android:visibility="gone" />



        <ImageButton android:id="@+id/rxVedioCallButton"

            style="@style/InCallButton"

            android:background="@drawable/btn_change_to_hm_video"

            android:contentDescription="@string/overflowRXCallMenuItemText"

            android:visibility="gone" />



        <ImageButton android:id="@+id/volteCallButton"

            style="@style/InCallButton"

            android:background="@drawable/btn_compound_audio"

            android:contentDescription="@string/overflowVOCallMenuItemText"

            android:visibility="gone" />



    </LinearLayout>



</LinearLayout>

InCallUI/res/layout/video_call_views.xml

+8 −4
Original line number Diff line number Diff line
@@ -20,11 +20,15 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent" >



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <TextureView

            android:id="@+id/incomingVideo"

            android:layout_gravity="center"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />

    </FrameLayout>

    <!-- The width and height are replaced at runtime based on the selected camera. -->

    <FrameLayout

        android:id="@+id/previewVideoContainer"

InCallUI/res/values/array.xml

+34 −0
Original line number Diff line number Diff line
@@ -132,4 +132,38 @@ 
        <item>@string/description_direction_left</item>

        <item>@null</item>

    </array>



   <array name="enhance_incoming_call_widget_video_without_sms_targets">

       <item>@drawable/ic_lockscreen_answer</item>

       <item>@drawable/ic_enhance_answer_rx_video</item>

       <item>@drawable/ic_lockscreen_decline</item>

       <item>@drawable/ic_enhance_answer_video</item>

   </array>

   <array name="enhance_incoming_call_widget_video_with_sms_targets">

       <item>@drawable/ic_enhance_answer_video</item>

       <item>@drawable/ic_lockscreen_text</item>

       <item>@drawable/ic_lockscreen_decline</item>

       <item>@drawable/ic_lockscreen_answer</item>

       <item>@drawable/ic_enhance_answer_rx_video</item>

       <item>@null</item>

   </array>

   <array name="enhance_incoming_call_widget_video_upgrade_request_targets">

       <item>@drawable/ic_enhance_answer_video</item>

       <item>@null</item>

       <item>@drawable/ic_enhance_decline_video</item>

       <item>@drawable/ic_enhance_answer_rx_video</item>

   </array>

   <array name="enhance_incoming_call_bidirectional_video_accept_request_targets">

       <item>@drawable/ic_enhance_answer_video</item>

       <item>@drawable/ic_enhance_decline_video</item>

   </array>

   <array name="enhance_incoming_call_video_transmit_accept_request_targets">

       <item>@drawable/ic_enhance_answer_tx_video</item>

       <item>@drawable/ic_enhance_decline_video</item>

   </array>

   <array name="enhance_incoming_call_video_receive_accept_request_targets">

       <item>@drawable/ic_enhance_answer_rx_video</item>

       <item>@drawable/ic_enhance_decline_video</item>

   </array>



</resources>

InCallUI/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -26,4 +26,8 @@ 
    <integer name="video_call_auto_fullscreen_timeout">5000</integer>

    <!-- When international prefix is enabled in CDMA mode, whether with international prefix -->

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



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

     <!-- When set to true, this config enables enhance videocall ui -->

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

</resources>

InCallUI/res/values/qtistrings.xml

+3 −0
Original line number Diff line number Diff line
@@ -177,4 +177,7 @@ 
    <string-array name="international_idp_values" translatable="false">

        <item>"0033"</item>

    </string-array>

    <string name="video_call_downgrade_without_lte_toast">Move out of LTE coverage area downgrade the call.</string>

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

    <string name="video_call_cannot_upgrade">cannot accept video calls at this time</string>

</resources>