diff options
author | Nancy Chen <nancychen@google.com> | 2016-02-11 17:55:41 -0800 |
---|---|---|
committer | Nancy Chen <nancychen@google.com> | 2016-02-17 18:24:16 -0800 |
commit | 5ab54403d906ce05251b780d6e91791242bceaab (patch) | |
tree | 1aff194ed29b82f8617112645684020faa19e44b /InCallUI/res/layout-w600dp-land | |
parent | 9710bb241ff7e6397def2c659da729b12d1c292e (diff) |
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
Diffstat (limited to 'InCallUI/res/layout-w600dp-land')
-rw-r--r-- | InCallUI/res/layout-w600dp-land/manage_conference_call_button.xml | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/InCallUI/res/layout-w600dp-land/manage_conference_call_button.xml b/InCallUI/res/layout-w600dp-land/manage_conference_call_button.xml new file mode 100644 index 000000000..9a83313ac --- /dev/null +++ b/InCallUI/res/layout-w600dp-land/manage_conference_call_button.xml @@ -0,0 +1,61 @@ +<?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> |