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

Commit 3ff0622b authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of... 

Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/packages/apps/Dialer into cm-14.0

"LA.UM.5.5.r1-00900-8x96.0"

Change-Id: I47ac2f3d3d21f5866dd3b8a9af0bb0804ac6e6da
parents 05c26eea 5e6eca16

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,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/layout/qti_video_call_picture_mode_menu.xml

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

<!--

  ~ Copyright (c) 2016, The Linux Foundation. All rights reserved.

  ~

  ~ Redistribution and use in source and binary forms, with or without

  ~ modification, are permitted provided that the following conditions are

  ~ met:

  ~      Redistributions of source code must retain the above copyright

  ~       notice, this list of conditions and the following disclaimer.

  ~      Redistributions in binary form must reproduce the above

  ~       copyright notice, this list of conditions and the following

  ~       disclaimer in the documentation and/or other materials provided

  ~       with the distribution.

  ~      Neither the name of The Linux Foundation nor the names of its

  ~       contributors may be used to endorse or promote products derived

  ~       from this software without specific prior written permission.

  ~

  ~ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

  ~ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

  ~ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

  ~ ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

  ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

  ~ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

  ~ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

  ~ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

  ~ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

  ~ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

  ~ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  ~

  -->



<!-- Video Call Picture mode menu for InCall UI -->



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

      android:layout_width="100dp"

      android:layout_height="wrap_content"

      android:theme="@style/Theme.InCallScreen"

      android:orientation="vertical">



    <CheckBox android:id="@+id/preview_video"

        android:text="@string/video_call_picture_mode_preview_video"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="10dp"

        android:layout_marginLeft="10dp"

    />



    <CheckBox android:id="@+id/incoming_video"

        android:text="@string/video_call_picture_mode_incoming_video"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@+id/preview_video"

        android:layout_marginTop="10dp"

        android:layout_marginLeft="10dp"

    />

</LinearLayout>

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>