diff options
Diffstat (limited to 'InCallUI/res/layout/manage_conference_call_button.xml')
| -rw-r--r-- | InCallUI/res/layout/manage_conference_call_button.xml | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml index d8ddf2189..375f88827 100644 --- a/InCallUI/res/layout/manage_conference_call_button.xml +++ b/InCallUI/res/layout/manage_conference_call_button.xml @@ -16,32 +16,39 @@ --> <!-- This button is used only on GSM devices, during a conference call. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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: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" + <!-- 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="24dp" - android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/incall_banner_secondary_text_color" - android:text="@string/onscreenManageConferenceText" /> + 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="?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: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> -</LinearLayout> +</FrameLayout> |