diff options
Diffstat (limited to 'InCallUI/res/layout')
| -rw-r--r-- | InCallUI/res/layout/call_button_fragment.xml | 11 | ||||
| -rw-r--r-- | InCallUI/res/layout/call_card_content.xml | 6 | ||||
| -rw-r--r-- | InCallUI/res/layout/extra_button_row.xml | 49 | ||||
| -rw-r--r-- | InCallUI/res/layout/manage_conference_call_button.xml | 47 |
4 files changed, 53 insertions, 60 deletions
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index 6b7e17aa9..aa87d0c1a 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -40,17 +40,6 @@ android:animateLayoutChanges="true" android:visibility="invisible" > - <!-- Row 1, the "extra button row": A couple of relatively rare - buttons used only in certain call states. - Most of the time this whole row is GONE. - For now, at least, there's only ever one button visible here - at a time, so this can be a simple FrameLayout. --> - <include android:id="@+id/extraButtonRow" - layout="@layout/extra_button_row" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <!-- Row 2: The main batch of in-call buttons. --> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml index c45553f6d..6d0ee8802 100644 --- a/InCallUI/res/layout/call_card_content.xml +++ b/InCallUI/res/layout/call_card_content.xml @@ -55,6 +55,7 @@ android:visibility="gone" android:padding="@dimen/call_banner_side_padding" android:background="@android:color/white" /> + </LinearLayout> <!-- Contact photo for primary call info --> @@ -98,6 +99,11 @@ <!-- Secondary "Call info" block, for the background ("on hold") call. --> <include layout="@layout/secondary_call_info" /> + <include layout="@layout/manage_conference_call_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignTop="@id/photo" /> + <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. --> <FrameLayout android:id="@+id/dialpadFragmentContainer" diff --git a/InCallUI/res/layout/extra_button_row.xml b/InCallUI/res/layout/extra_button_row.xml deleted file mode 100644 index 417c4d6b9..000000000 --- a/InCallUI/res/layout/extra_button_row.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?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 - --> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/button_background_color"> - <!-- The buttons here have a text label floating off to the side - (which is necessary because these buttons are used only in - a few rare states, and the meaning of the icon might not be - obvious.) The entire row (button + text) is clickable. --> - - <!-- "Manage conference" --> - <!-- This button is used only on GSM devices, during a conference call. --> - <LinearLayout android:id="@+id/manageConferenceButton" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="@dimen/button_cluster_horizontal_padding" - android:paddingEnd="@dimen/button_cluster_horizontal_padding" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone"> - <!-- The entire LinearLayout here is clickable, so we don't - care about clicks on the ImageButton itself. --> - <ImageButton android:id="@+id/manageConferenceButtonImage" - android:clickable="false" - style="@style/InCallExtraRowButton" - android:src="@drawable/ic_groups_holo_dark" - android:contentDescription="@string/onscreenManageConferenceText" /> - <TextView android:id="@+id/manageConferenceButtonLabel" - style="@style/InCallExtraRowButtonLabel" - android:text="@string/onscreenManageConferenceText" /> - </LinearLayout> - -</FrameLayout> diff --git a/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml new file mode 100644 index 000000000..d8ddf2189 --- /dev/null +++ b/InCallUI/res/layout/manage_conference_call_button.xml @@ -0,0 +1,47 @@ +<?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 + --> + +<!-- This button is used only on GSM devices, during a conference call. --> +<LinearLayout 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:orientation="horizontal" + android:paddingStart="@dimen/call_banner_side_padding" + android:paddingEnd="@dimen/secondary_call_banner_right_padding" + android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding" + android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding" + android:background="@color/incall_banner_secondary_background_color"> + + <!-- The entire LinearLayout here is clickable, so we ignore ImageButton clicks. --> + <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:contentDescription="@string/onscreenManageConferenceText" /> + + <TextView android:id="@+id/manageConferenceButtonLabel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="24dp" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/incall_banner_secondary_text_color" + android:text="@string/onscreenManageConferenceText" /> + +</LinearLayout> |