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

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

Promotion of atel.lnx.2.0.c1-00001. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1075332   Id3bc8275b9315b32bde08b99aa344a3af42007c2   Dialer: fix video call UI issue.
1024387   Id5c2334146dbd21fe3fa14102a74d4976af1205a   IMS-VT: InCallUI fragment cropped in landscape
1078574   I2d436d592b3dba3c286631fe53f0b2842e567664   Dialer: fix the display issue for VT Call.
1072624   I735779df6d8a16fd79e2dc7227228546530f2496   Handle secret codes without pressing dial button
1069172   I69a052f204561f5692e63130ba6895e297b068fd   Dialer: Check the state of writing system settings permi
1081377   I9a2da86f3575c7d7670167fbf66756ce221b8ae9   Dialer: WFC UI requiment: Notification and Dialog for ne

Change-Id: I60b1392eef605004e342b6a10c96066da005a65a
CRs-Fixed: 1081377, 1075332, 1024387, 1069172, 1078574, 1072624
parents e3082dcc fcbf583f

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ 
                  android:label=""

                  android:excludeFromRecents="true"

                  android:launchMode="singleInstance"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboardHidden"

                  android:configChanges="smallestScreenSize|screenLayout|keyboardHidden"

                  android:exported="false"

                  android:screenOrientation="nosensor"

                  android:directBootAware="true"

InCallUI/res/layout-w500dp-land/call_card_fragment.xml

+111 −108
Original line number Diff line number Diff line
@@ -16,47 +16,13 @@ 
  ~ limitations under the License

  -->



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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal">



    <LinearLayout

        android:id="@+id/primary_call_info_container"

        android:layout_centerVertical="true"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="vertical"

        android:elevation="@dimen/primary_call_elevation"

        android:background="@drawable/rounded_call_card_background"

        android:paddingTop="@dimen/call_banner_primary_call_container_top_padding"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:alpha="0.9"

        android:layout_margin="10dp">



        <include layout="@layout/primary_call_info" />



        <fragment android:name="com.android.incallui.CallButtonFragment"

            android:id="@+id/callButtonFragment"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom|center_horizontal"

            android:layout_marginBottom="@dimen/call_buttons_bottom_margin" />



        <!-- Secondary "Call info" block, for the background ("on hold") call. -->

        <include layout="@layout/secondary_call_info"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom" />



    </LinearLayout>

    android:layout_height="match_parent">



    <FrameLayout

        android:layout_height="match_parent"

        android:layout_width="0dp"

        android:layout_weight="1">

        android:layout_width="match_parent">



        <FrameLayout

            android:layout_height="match_parent"
@@ -116,28 +82,13 @@ 


        </FrameLayout>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_centerHorizontal="true"

            android:layout_below="@id/primary_call_info_container">



            <include layout="@layout/manage_conference_call_button"

        <fragment android:name="com.android.incallui.VideoCallFragment"

            android:layout_alignParentStart="true"

            android:layout_gravity="start|center_vertical"

            android:id="@+id/videoCallFragment"

            android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:elevation="5dp"

                android:layout_alignParentBottom="true"/>



            <!-- Volume boost and Volume enhancements in-call UI -->

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

                android:layout_width="80dp"

                android:layout_height="80dp"

                android:visibility="gone"

                android:soundEffectsEnabled="false"

                android:background="@drawable/vb_normal"/>



        </LinearLayout>

            android:layout_height="match_parent" />

    </FrameLayout>



    <!-- Call recorder infor -->

    <RelativeLayout
@@ -168,17 +119,71 @@ 
            android:visibility="invisible"/>

    </RelativeLayout>



        <fragment android:name="com.android.incallui.VideoCallFragment"

            android:layout_alignParentStart="true"

            android:layout_gravity="start|center_vertical"

            android:id="@+id/videoCallFragment"

    <LinearLayout

        android:layout_width="match_parent"

            android:layout_height="match_parent" />

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:layout_centerHorizontal="true">



        <include layout="@layout/manage_conference_call_button"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:elevation="5dp"

            android:layout_alignParentBottom="true"/>



        <!-- Volume boost and Volume enhancements in-call UI -->

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

            android:layout_width="80dp"

            android:layout_height="80dp"

            android:visibility="gone"

            android:soundEffectsEnabled="false"

            android:background="@drawable/vb_normal"/>

    </LinearLayout>



    <!-- Secondary "Call info" block, for the background ("on hold") call. -->

    <include layout="@layout/secondary_call_info"

             android:id="@+id/secondary_call_info"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:layout_alignParentBottom="true" />



    <LinearLayout

        android:id="@+id/primary_call_info_container"

        android:layout_alignParentStart="true"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_above="@id/secondary_call_info"

        android:orientation="vertical"

        android:elevation="@dimen/primary_call_elevation"

        android:background="@drawable/rounded_call_card_background"

        android:paddingTop="@dimen/call_banner_primary_call_container_top_padding"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:alpha="0.9"

        android:layout_margin="10dp">



        <include layout="@layout/primary_call_info" />



        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="match_parent" >



            <fragment android:name="com.android.incallui.CallButtonFragment"

                android:id="@+id/callButtonFragment"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="bottom" />



        </FrameLayout>



    </LinearLayout>



    <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->

    <FrameLayout

        android:id="@+id/answer_and_dialpad_container"

            android:layout_gravity="bottom"

        android:layout_toEndOf="@id/primary_call_info_container"

        android:layout_gravity="end|center_vertical"

        android:layout_alignParentEnd="true"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />
@@ -187,9 +192,10 @@ 
        android:layout_width="@dimen/end_call_floating_action_button_diameter"

        android:layout_height="@dimen/end_call_floating_action_button_diameter"

        android:background="@drawable/fab_red"

            android:layout_gravity="bottom|center_horizontal"

        android:layout_alignParentRight="true"

        android:layout_alignParentBottom="true"

        android:layout_marginRight="@dimen/end_call_button_margin_right"

        android:layout_marginBottom="@dimen/end_call_button_margin_bottom">



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

            android:layout_width="match_parent"

            android:layout_height="match_parent"
@@ -197,9 +203,6 @@ 
            android:src="@drawable/fab_ic_end_call"

            android:scaleType="center"

            android:contentDescription="@string/onscreenEndCallText" />



     </FrameLayout>



    </FrameLayout>



</LinearLayout>
 
</RelativeLayout>

InCallUI/res/layout/primary_call_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/primary_call_banner"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:paddingStart="@dimen/call_banner_side_padding"

        android:paddingEnd="@dimen/call_banner_side_padding"

InCallUI/res/values-w500dp-land/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -32,4 +32,6 @@ 
    <dimen name="dialpad_elevation">2dp</dimen>



    <dimen name="video_preview_margin">20dp</dimen>



    <dimen name="end_call_button_margin_right">80dp</dimen>

</resources>

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);