diff options
author | Qi Wang <wangqi@google.com> | 2016-02-23 19:07:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-23 19:07:16 +0000 |
commit | 6cdceed84c79ea80e22934540abc95c3fd13ead0 (patch) | |
tree | 60176fead5eba995d09cb3c6b9ea574b812df403 /InCallUI/res | |
parent | 521ba6a9e56e5289c6b2c01ac1ed4e09be82860b (diff) | |
parent | 5ab54403d906ce05251b780d6e91791242bceaab (diff) |
Merge "Display manage conference button." into nyc-dev
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/layout-h600dp/manage_conference_call_button.xml | 61 | ||||
-rw-r--r-- | InCallUI/res/layout-w600dp-land/manage_conference_call_button.xml | 61 | ||||
-rw-r--r-- | InCallUI/res/layout/call_card_fragment.xml | 12 | ||||
-rw-r--r-- | InCallUI/res/layout/manage_conference_call_button.xml | 81 | ||||
-rw-r--r-- | InCallUI/res/values/strings.xml | 4 |
5 files changed, 178 insertions, 41 deletions
diff --git a/InCallUI/res/layout-h600dp/manage_conference_call_button.xml b/InCallUI/res/layout-h600dp/manage_conference_call_button.xml new file mode 100644 index 000000000..9a83313ac --- /dev/null +++ b/InCallUI/res/layout-h600dp/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> 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> diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index 03bbe87b8..fabde378a 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -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> 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 diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index df588d540..2f3d16b73 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -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> |