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

Commit cb025090 authored by Andalam Parthasarathi's avatar Andalam Parthasarathi Committed by Gerrit - the friendly Code Review server
Browse files

IMS-VT: InCallUI fragment cropped in landscape 

In IMS VT call InCallUI fragment is cropped.
Contact name, hdAudioIcon and DTMF dialpad are not
showing correctly.
Fix: Now recreate function is not being called from
onConfigurationChanged for screen orientation change.
Recreate function calls automatically
by android and redesigned the layout to show.
  Video call view in full screen
  Primary call banner come on top of video call view
  Dial pad on right of Primary call banner
  Call record timer at lower half

Change-Id: Id5c2334146dbd21fe3fa14102a74d4976af1205a
CRs-Fixed: 1024387
parent e3082dcc

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>