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

Commit 53485a55 authored by Yorke Lee's avatar Yorke Lee
Browse files

Video calling landscape changes to match specs 

* Call card has 4dp corners, and is 90% visible
* Margins for call card
* Call buttons are center aligned with end call button
* Remote surface is always center aligned, tapping call card slides
it in and out
* Status bar is black

Bug: 19668216
Change-Id: Ifea27faa5f8ff32f6be13e777ca70aa4d0c7727e
parent 4b06b9c7

InCallUI/res/drawable-land/rounded_call_card_background.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



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

    <solid android:color="@color/incall_call_banner_background_color" />

    <corners

        android:radius="4dp" />

</shape>
 
 No newline at end of file

InCallUI/res/layout-land/call_card_fragment.xml

+11 −8
Original line number Diff line number Diff line
@@ -28,22 +28,25 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical"

        android:elevation="@dimen/primary_call_elevation"

        android:background="@color/incall_call_banner_background_color"

        android:background="@drawable/rounded_call_card_background"

        android:paddingTop="@dimen/call_banner_primary_call_container_top_padding"

        android:clipChildren="false"

        android:clipToPadding="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="match_parent"

            android:layout_height="wrap_content" />



        <FrameLayout

            android:layout_width="match_parent"

            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"

                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"

InCallUI/res/values-land/colors.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<resources>

    <!-- Background color for status bar. For portrait this will be ignored. -->

    <color name="statusbar_background_color">#000000</color>

</resources>

InCallUI/res/values-land/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 
  -->



<resources>

    <!-- 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>

</resources>

InCallUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 


    <!-- Background color of action bars -->

    <color name="actionbar_background_color">@color/dialer_theme_color</color>

    <!-- Background color for status bar. For portrait this will be ignored. -->

    <color name="statusbar_background_color">@color/dialer_theme_color</color>



    <color name="translucent_shadow">#33999999</color>