diff options
Diffstat (limited to 'InCallUI/res/layout/manage_conference_call_button.xml')
-rw-r--r-- | InCallUI/res/layout/manage_conference_call_button.xml | 81 |
1 files changed, 46 insertions, 35 deletions
diff --git a/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml index 3b5ef9931..01ca1bdc3 100644 --- a/InCallUI/res/layout/manage_conference_call_button.xml +++ b/InCallUI/res/layout/manage_conference_call_button.xml @@ -1,28 +1,27 @@ <?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. --> <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: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,30 +31,42 @@ 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" - 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" /> + <!-- 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"/> + + <TextView android:id="@+id/manageConferenceLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/incall_banner_secondary_text_color" + android:textSize="@dimen/secondary_call_info_text_size" + android:textAlignment="viewStart" + android:text="@string/onscreenManageText" + android:singleLine="true"/> </LinearLayout> -</FrameLayout> +</FrameLayout>
\ No newline at end of file |