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

Commit 011264fb authored by Nancy Chen's avatar Nancy Chen Committed by android-build-merger
Browse files

Display video call fragment for multi-window mode. am: 9710bb24 

am: 37e4cae9

* commit '37e4cae9':
  Display video call fragment for multi-window mode.
parents ccf6b2a0 37e4cae9

InCallUI/res/layout/call_card_fragment.xml

+27 −27
Original line number Diff line number Diff line
@@ -78,6 +78,33 @@ 


    </FrameLayout>



    <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->

    <FrameLayout

        android:id="@+id/progressSpinner"

        android:background="#63000000"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_centerHorizontal="true"

        android:layout_centerVertical="true"

        android:visibility="gone" >



        <ProgressBar

            android:id="@+id/progress_bar"

            style="@android:style/Widget.Material.ProgressBar"

            android:layout_gravity="center"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:indeterminate="true" />



    </FrameLayout>



    <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="match_parent" />



    <FrameLayout

        android:layout_height="match_parent"

        android:layout_width="0dp"
@@ -126,33 +153,6 @@ 
                 android:layout_height="wrap_content"

                 android:layout_alignTop="@id/photoLarge" />



        <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->

        <FrameLayout

            android:id="@+id/progressSpinner"

            android:background="#63000000"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_centerHorizontal="true"

            android:layout_centerVertical="true"

            android:visibility="gone" >



            <ProgressBar

                android:id="@+id/progress_bar"

                style="@android:style/Widget.Material.ProgressBar"

                android:layout_gravity="center"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:indeterminate="true" />



        </FrameLayout>



        <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="match_parent" />



    </FrameLayout>



</RelativeLayout>

InCallUI/res/layout/video_call_views.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    <FrameLayout

        android:id="@+id/previewVideoContainer"

        android:layout_width="70dp"

        android:layout_height="120dp"

        android:layout_height="0dp"

        android:layout_gravity="bottom|right"

        android:layout_margin="@dimen/video_preview_margin" >

InCallUI/res/values-h600dp/dimens.xml

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



    <dimen name="dialpad_elevation">2dp</dimen>



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

</resources>

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

+4 −0
Original line number Diff line number Diff line
@@ -21,11 +21,15 @@ 


    <!-- Whether or not the landscape mode layout is currently being used -->

    <bool name="is_layout_landscape">true</bool>



    <!-- Height and width of the in-call buttons. -->

    <dimen name="in_call_button_dimension">40dp</dimen>



    <!-- Margin underneath the call buttons. This is used only in landscape mode and is sized

         so that the call buttons are center aligned with the end call button. -->

    <dimen name="call_buttons_bottom_margin">30dp</dimen>



    <dimen name="dialpad_elevation">2dp</dimen>



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

</resources>

InCallUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
    <dimen name="in_call_button_dimension">48dp</dimen>



    <dimen name="primary_call_elevation">0dp</dimen>

    <dimen name="dialpad_elevation">5dp</dimen>

    <dimen name="dialpad_elevation">2dp</dimen>



    <!-- The InCallUI dialpad will sometimes want digits sizes that are different from dialer.

         Note: These are the default sizes for small (<600dp height) devices: larger screen sizes
@@ -117,7 +117,7 @@ 
         width of the preview.  When in landscape, this is the height. -->

    <dimen name="video_preview_small_dimension">90dp</dimen>



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

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



    <dimen name="end_call_floating_action_button_diameter">72dp</dimen>

    <dimen name="end_call_floating_action_button_small_diameter">56dp</dimen>