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

Commit 5ab54403 authored by Nancy Chen's avatar Nancy Chen
Browse files

Display manage conference button. 

The manage conference button allows the user to unmerge or hangup one of
the calls in the conference for GMS and IMS devices.
+ Move the original manage_conference_call_button layout file to
layout-h600dp and layout-w600dp-land directories.
+ Fix the button to the bottom of the call card fragment.
+ Split the "manage conference call" text into two pieces and put
"conference call" on one side and "manage" with the icon on the other.

Bug: 26253432
Change-Id: I9853f479d4e45591026fe7a753eca1ef69b00e42
parent 9710bb24

InCallUI/res/layout-h600dp/manage_conference_call_button.xml

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

<!--

  ~ Copyright (C) 2016 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

  -->



<!-- This button is used only on GSM and IMS devices, during a conference call. -->

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

    android:id="@+id/manage_conference_call_button"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@color/incall_banner_secondary_background_color"

    android:focusable="true"

    android:contentDescription="@string/onscreenManageConferenceText">



    <Space android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="@color/secondary_call_info_divider_highlight_color" />



    <!-- This LinearLayout nested immediately in a FrameLayout is necessary to apply both a

         background color and ripple to the button. -->

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/secondary_call_info_horizontal_padding"

        android:paddingEnd="@dimen/secondary_call_info_horizontal_padding"

        android:paddingTop="@dimen/secondary_call_info_vertical_padding"

        android:paddingBottom="@dimen/secondary_call_info_vertical_padding"

        android:background="?android:attr/selectableItemBackground">



        <ImageView android:id="@+id/manageConferenceButtonImage"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_group_white_24dp"

            android:tint="@color/incall_banner_secondary_text_color"

            android:paddingEnd="16dp"

            android:importantForAccessibility="no" />



        <TextView android:id="@+id/manageConferenceButtonLabel"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_vertical"

            android:textColor="@color/incall_banner_secondary_text_color"

            android:textSize="@dimen/secondary_call_info_text_size"

            android:text="@string/onscreenManageConferenceText"

            android:importantForAccessibility="no" />



    </LinearLayout>



</FrameLayout>

InCallUI/res/layout-w600dp-land/manage_conference_call_button.xml

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

<!--

  ~ Copyright (C) 2016 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

  -->



<!-- This button is used only on GSM and IMS devices, during a conference call. -->

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

    android:id="@+id/manage_conference_call_button"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@color/incall_banner_secondary_background_color"

    android:focusable="true"

    android:contentDescription="@string/onscreenManageConferenceText">



    <Space android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="@color/secondary_call_info_divider_highlight_color" />



    <!-- This LinearLayout nested immediately in a FrameLayout is necessary to apply both a

         background color and ripple to the button. -->

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/secondary_call_info_horizontal_padding"

        android:paddingEnd="@dimen/secondary_call_info_horizontal_padding"

        android:paddingTop="@dimen/secondary_call_info_vertical_padding"

        android:paddingBottom="@dimen/secondary_call_info_vertical_padding"

        android:background="?android:attr/selectableItemBackground">



        <ImageView android:id="@+id/manageConferenceButtonImage"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_group_white_24dp"

            android:tint="@color/incall_banner_secondary_text_color"

            android:paddingEnd="16dp"

            android:importantForAccessibility="no" />



        <TextView android:id="@+id/manageConferenceButtonLabel"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_vertical"

            android:textColor="@color/incall_banner_secondary_text_color"

            android:textSize="@dimen/secondary_call_info_text_size"

            android:text="@string/onscreenManageConferenceText"

            android:importantForAccessibility="no" />



    </LinearLayout>



</FrameLayout>

InCallUI/res/layout/call_card_fragment.xml

+6 −6
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ 
             android:elevation="4dp"

             android:layout_alignParentBottom="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"/>



    <FrameLayout

        android:id="@+id/floating_end_call_action_button_container"

        android:layout_width="@dimen/end_call_floating_action_button_diameter"
@@ -147,12 +153,6 @@ 
                          android:dividerHeight="@dimen/contact_context_list_item_padding" />

            </LinearLayout>

        </FrameLayout>



        <include layout="@layout/manage_conference_call_button"

                 android:layout_width="match_parent"

                 android:layout_height="wrap_content"

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



    </FrameLayout>



</RelativeLayout>

InCallUI/res/layout/manage_conference_call_button.xml

+46 −35
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2013 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

<!-- Copyright (C) 2013 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.

-->



<!-- This button is used only on GSM and IMS devices, during a conference call. -->
@@ -20,9 +19,9 @@ 
    android:id="@+id/manage_conference_call_button"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_alignParentBottom="true"

    android:background="@color/incall_banner_secondary_background_color"

    android:focusable="true"

    android:contentDescription="@string/onscreenManageConferenceText">

    android:visibility="gone">



    <Space android:layout_width="match_parent"

        android:layout_height="1dp"
@@ -32,29 +31,41 @@ 
         background color and ripple to the button. -->

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:paddingStart="@dimen/secondary_call_info_horizontal_padding"

        android:paddingEnd="@dimen/secondary_call_info_horizontal_padding"

        android:paddingTop="@dimen/secondary_call_info_vertical_padding"

        android:paddingBottom="@dimen/secondary_call_info_vertical_padding"

        android:background="?android:attr/selectableItemBackground">



        <ImageView android:id="@+id/manageConferenceButtonImage"

        <!-- Call status of the background call, usually the string "On hold". -->

        <TextView android:id="@+id/conferenceLabel"

                  android:layout_width="0dp"

                  android:layout_height="wrap_content"

                  android:layout_weight="1"

                  android:layout_gravity="center_vertical"

                  android:paddingEnd="18dp"

                  android:text="@string/onscreenConferenceText"

                  android:textColor="@color/incall_banner_secondary_text_color"

                  android:textSize="@dimen/secondary_call_info_text_size"

                  android:singleLine="true" />



        <ImageView android:id="@+id/manageConferenceImage"

                   android:layout_width="wrap_content"

                   android:layout_height="wrap_content"

                   android:src="@drawable/ic_group_white_24dp"

                   android:tint="@color/incall_banner_secondary_text_color"

            android:paddingEnd="16dp"

            android:importantForAccessibility="no" />

                   android:paddingEnd="16dp"/>



        <TextView android:id="@+id/manageConferenceButtonLabel"

            android:layout_width="match_parent"

        <TextView android:id="@+id/manageConferenceLabel"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

            android:gravity="center_vertical"

                  android:textColor="@color/incall_banner_secondary_text_color"

                  android:textSize="@dimen/secondary_call_info_text_size"

            android:text="@string/onscreenManageConferenceText"

            android:importantForAccessibility="no" />

                  android:textAlignment="viewStart"

                  android:text="@string/onscreenManageText"

                  android:singleLine="true"/>



    </LinearLayout>

InCallUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -289,6 +289,10 @@ 
    <string name="onscreenManageCallsText">Manage calls</string>

    <!-- Text for the onscreen "Manage conference" button [CHAR LIMIT=30] -->

    <string name="onscreenManageConferenceText">Manage conference call</string>

    <!-- Text for the first half of the onscreen "Manage conference" button [CHAR LIMIT=30] -->

    <string name="onscreenConferenceText">Conference call</string>

    <!-- Text for the second half of the onscreen "Manage conference" button [CHAR LIMIT=30] -->

    <string name="onscreenManageText">Manage</string>

    <!-- Text for the onscreen "Audio" button that lets you switch

         between speaker / bluetooth / earpiece [CHAR LIMIT=10] -->

    <string name="onscreenAudioText">Audio</string>