diff options
Diffstat (limited to 'InCallUI/res')
14 files changed, 317 insertions, 6 deletions
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml new file mode 100644 index 000000000..c5a41d814 --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2014, The Linux Foundation. All rights reserved. + ~ Not a Contribution. + ~ Copyright (C) 2014 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 + --> +<!-- Used with incoming call wigdet. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_enabled="true" android:state_active="false" android:state_focused="false" + android:drawable="@drawable/ic_lockscreen_answer_rx_video_normal_layer"/> + <item + android:state_enabled="true" android:state_active="true" android:state_focused="false" + android:drawable="@drawable/ic_lockscreen_answer_rx_video_activated_layer" /> + <item + android:state_enabled="true" android:state_active="false" android:state_focused="true" + android:drawable="@drawable/ic_lockscreen_answer_rx_video_activated_layer" /> +</selector> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml new file mode 100644 index 000000000..750ef5e26 --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2014, The Linux Foundation. All rights reserved. + ~ Not a Contribution. + ~ Copyright (C) 2014 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 + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/fab_red" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_rx_videocam" + android:tint="@color/glowpad_widget_active_color" + android:autoMirrored="true" /> + </item> +</layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml new file mode 100644 index 000000000..5efd3d142 --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2014, The Linux Foundation. All rights reserved. + ~ Not a Contribution. + ~ Copyright (C) 2014 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 + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- A fake circle to fix the size of this layer asset. --> + <item> + <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> + <solid android:color="#00000000"/> + <size + android:width="@dimen/incoming_call_widget_circle_size" + android:height="@dimen/incoming_call_widget_circle_size" /> + </shape> + </item> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_rx_videocam" + android:tint="@color/glowpad_call_widget_normal_tint" + android:autoMirrored="true" /> + </item> +</layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml new file mode 100644 index 000000000..15d11978e --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2014, The Linux Foundation. All rights reserved. + ~ Not a Contribution. + ~ Copyright (C) 2014 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 + --> +<!-- Used with incoming call wigdet. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:state_enabled="true" android:state_active="false" android:state_focused="false" + android:drawable="@drawable/ic_lockscreen_answer_tx_video_normal_layer"/> + <item + android:state_enabled="true" android:state_active="true" android:state_focused="false" + android:drawable="@drawable/ic_lockscreen_answer_tx_video_activated_layer" /> + <item + android:state_enabled="true" android:state_active="false" android:state_focused="true" + android:drawable="@drawable/ic_lockscreen_answer_tx_video_activated_layer" /> +</selector> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml new file mode 100644 index 000000000..c1dca4d06 --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2014, The Linux Foundation. All rights reserved. + ~ Not a Contribution. + ~ Copyright (C) 2014 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 + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/fab_green" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_tx_videocam" + android:tint="@color/glowpad_widget_active_color" + android:autoMirrored="true" /> + </item> +</layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml new file mode 100644 index 000000000..b0ad943dc --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2014, The Linux Foundation. All rights reserved. + ~ Not a Contribution. + ~ Copyright (C) 2014 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 + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- A fake circle to fix the size of this layer asset. --> + <item> + <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> + <solid android:color="#00000000"/> + <size + android:width="@dimen/incoming_call_widget_circle_size" + android:height="@dimen/incoming_call_widget_circle_size" /> + </shape> + </item> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_tx_videocam" + android:tint="@color/glowpad_call_widget_normal_tint" + android:autoMirrored="true" /> + </item> +</layer-list> diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml index 496b6b399..0bb45a244 100644 --- a/InCallUI/res/layout-land/call_card_content.xml +++ b/InCallUI/res/layout-land/call_card_content.xml @@ -71,6 +71,13 @@ android:layout_height="wrap_content" android:layout_alignTop="@id/photo" /> + <fragment android:name="com.android.incallui.VideoCallFragment" + android:layout_alignParentStart="true" + android:layout_gravity="start|center_vertical" + android:id="@+id/videoCallFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> <FrameLayout android:id="@+id/progressSpinner" diff --git a/InCallUI/res/layout-land/video_call_views.xml b/InCallUI/res/layout-land/video_call_views.xml index 7065d4515..8961ea4bf 100644 --- a/InCallUI/res/layout-land/video_call_views.xml +++ b/InCallUI/res/layout-land/video_call_views.xml @@ -22,7 +22,7 @@ <TextureView android:id="@+id/incomingVideo" - android:layout_gravity="center_horizontal" + android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" /> <!-- The width and height are replaced at runtime based on the selected camera. --> @@ -32,4 +32,4 @@ android:layout_margin="@dimen/video_preview_margin" android:layout_width="70dp" android:layout_height="120dp" /> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index e8feca68a..69d0ee3a0 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -160,6 +160,13 @@ android:contentDescription="@string/onscreenOverflowText" android:visibility="gone" /> + <!-- "Manage conference button (Video Call) " --> + <ImageButton android:id="@+id/manageVideoCallConferenceButton" + style="@style/InCallButton" + android:background="@drawable/ic_group_white_24dp" + android:contentDescription="@string/onscreenManageConferenceText" + android:visibility="gone" /> + </LinearLayout> </LinearLayout> diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml index 7a42586ea..a5fd8f72a 100644 --- a/InCallUI/res/layout/call_card_content.xml +++ b/InCallUI/res/layout/call_card_content.xml @@ -70,6 +70,13 @@ android:background="@android:color/white" android:src="@drawable/img_no_image_automirrored" /> + <fragment android:name="com.android.incallui.VideoCallFragment" + android:id="@+id/videoCallFragment" + android:layout_alignParentTop="true" + android:layout_gravity="top|center_horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> <FrameLayout android:id="@+id/progressSpinner" diff --git a/InCallUI/res/layout/video_call_views.xml b/InCallUI/res/layout/video_call_views.xml index ab03aa358..8961ea4bf 100644 --- a/InCallUI/res/layout/video_call_views.xml +++ b/InCallUI/res/layout/video_call_views.xml @@ -22,7 +22,7 @@ <TextureView android:id="@+id/incomingVideo" - android:layout_gravity="center_vertical" + android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" /> <!-- The width and height are replaced at runtime based on the selected camera. --> @@ -32,4 +32,4 @@ android:layout_margin="@dimen/video_preview_margin" android:layout_width="70dp" android:layout_height="120dp" /> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/InCallUI/res/menu/incall_overflow_menu.xml b/InCallUI/res/menu/incall_overflow_menu.xml index 06208ebd8..2de858711 100644 --- a/InCallUI/res/menu/incall_overflow_menu.xml +++ b/InCallUI/res/menu/incall_overflow_menu.xml @@ -30,4 +30,7 @@ <item android:id="@+id/overflow_swap_menu_item" android:title="@string/overflowSwapMenuItemText" /> + + <item android:id="@+id/overflow_manage_conference_menu_item" + android:title="@string/overflowManageConferenceMenuItemText" /> </menu> diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml index 5270de1ac..46592e126 100644 --- a/InCallUI/res/values/array.xml +++ b/InCallUI/res/values/array.xml @@ -74,6 +74,8 @@ <item>@null</item> <item>@drawable/ic_lockscreen_decline</item> <item>@drawable/ic_lockscreen_answer_video</item> + <item>@drawable/ic_lockscreen_answer_tx_video</item> + <item>@drawable/ic_lockscreen_answer_rx_video</item> </array> <array name="incoming_call_widget_video_without_sms_target_descriptions"> <item>@string/description_target_answer_video_call</item> @@ -98,6 +100,8 @@ <item>@drawable/ic_lockscreen_text</item> <item>@drawable/ic_lockscreen_decline</item> <item>@drawable/ic_lockscreen_answer</item> + <item>@drawable/ic_lockscreen_answer_tx_video</item> + <item>@drawable/ic_lockscreen_answer_rx_video</item> </array> <array name="incoming_call_widget_video_with_sms_target_descriptions"> <item>@string/description_target_answer_video_call</item> @@ -113,7 +117,7 @@ </array> - <!-- For upgrade to video in an active video call. + <!-- For upgrade to video from VOLTE to VT (Tx/Rx/Bidirectional) in an active video call. - Accept upgrade to video request (drag right) - Decline upgrade to video request (drag left) - Answer as audio call (drag down) --> @@ -121,7 +125,9 @@ <item>@drawable/ic_lockscreen_answer_video</item> <item>@null</item> <item>@drawable/ic_lockscreen_decline</item> - <item>@null</item>" + <item>@drawable/ic_lockscreen_answer</item> + <item>@drawable/ic_lockscreen_answer_tx_video</item> + <item>@drawable/ic_lockscreen_answer_rx_video</item> </array> <array name="incoming_call_widget_video_upgrade_request_target_descriptions"> <item>@string/description_target_accept_upgrade_to_video_request</item> @@ -135,4 +141,37 @@ <item>@string/description_direction_left</item> <item>@null</item> </array> + + <!-- For accept/reject upgrade to video in active video call + - Accept upgrade to video request (drag right) + - Decline upgrade to video request (drag left)--> + <array name="incoming_call_widget_bidirectional_video_accept_reject_request_targets"> + <item>@drawable/ic_lockscreen_answer_video</item> + <item>@drawable/ic_lockscreen_decline</item> + </array> + + <!-- For accept/reject upgrade to video transmit in active video call + - Accept upgrade to video request (drag right) + - Decline upgrade to video request (drag left)--> + <array name="incoming_call_widget_video_transmit_accept_reject_request_targets"> + <item>@drawable/ic_lockscreen_answer_tx_video</item> + <item>@drawable/ic_lockscreen_decline</item> + </array> + <array name="incoming_call_widget_video_transmit_request_target_descriptions"> + <item>@string/description_target_accept_upgrade_to_video_transmit_request</item> + <item>@string/description_target_decline_upgrade_to_video_transmit_request</item> + </array> + + <!-- For accept/reject upgrade to video receive in active video call + - Accept upgrade to video request (drag right) + - Decline upgrade to video request (drag left)--> + <array name="incoming_call_widget_video_receive_accept_reject_request_targets"> + <item>@drawable/ic_lockscreen_answer_rx_video</item> + <item>@drawable/ic_lockscreen_decline</item> + </array> + <array name="incoming_call_widget_video_receive_request_target_descriptions"> + <item>@string/description_target_accept_upgrade_to_video_receive_request</item> + <item>@string/description_target_decline_upgrade_to_video_receive_request</item> + </array> + </resources> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 944eff6fc..99b8111bb 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -114,6 +114,8 @@ <string name="card_title_video_call_requesting">Requesting video</string> <!-- In-call screen: status label when there is a problem connecting a video call. --> <string name="card_title_video_call_error">Can\'t connect video call</string> + <!-- In-call screen: status label when in a paused video call. --> + <string name="card_title_video_call_paused">Video call (Paused)</string> <!-- In-call screen: string shown to the user when their outgoing number is different than the number reported by TelephonyManager#getLine1Number() --> @@ -263,6 +265,8 @@ <string name="overflowMergeMenuItemText">Merge calls</string> <!-- Text for the onscreen "Swap calls" menu item. --> <string name="overflowSwapMenuItemText">Swap calls</string> + <!-- Text for the overflow "Manage Conference Video Call" menu item. --> + <string name="overflowManageConferenceMenuItemText">Manage Conference</string> <!-- Text for the onscreen "Hold" button --> <string name="onscreenHoldText">Hold</string> @@ -299,6 +303,28 @@ <!-- Text for the onscreen overflow button, to see additional actions which can be done. --> <string name="onscreenOverflowText">More options</string> + <!-- STOPSHIP - For test only - In-call screen: Modify Call Options for IMS call --> + <string name="modify_call_option_title" translatable="false">Which type of call?</string> + <string name="modify_call_option_vt" translatable="false">Video bidirectional</string> + <string name="modify_call_option_vt_tx" translatable="false">Video transmit</string> + <string name="modify_call_option_vt_rx" translatable="false">Video receive</string> + <string name="modify_call_option_voice" translatable="false">Voice Only</string> + + <!-- Message indicating video calls not allowed if user enabled TTY Mode --> + <string name="video_call_not_allowed_if_tty_enabled">Please disable TTY Mode to upgrade to video calls.</string> + + <!-- Message indicating that Video Started flowing for IMS-VT calls --> + <string name="player_started">Player Started</string> + <!-- Message indicating that Video Stopped flowing for IMS-VT calls --> + <string name="player_stopped">Player Stopped</string> + <!-- Message indicating that camera failure has occurred for the selected camera and + as result camera is not ready --> + <string name="camera_not_ready">Camera not ready</string> + <!-- Message indicating that camera is ready/available --> + <string name="camera_ready">Camera ready</string> + <!-- Message indicating unknown call session event --> + <string name="unknown_call_session_event">"Unkown call session event"</string> + <!-- For incoming calls, this is a string we can get from a CDMA network instead of the actual phone number, to indicate there's no number present. DO NOT TRANSLATE. --> <string-array name="absent_num" translatable="false"> @@ -359,6 +385,18 @@ <!-- Description of the target to decline a request to upgrade from an audio call to a video call. [CHAR LIMIT=NONE] --> <string name="description_target_decline_upgrade_to_video_request">Decline video request</string> + <!-- Description of the target to accept a request to upgrade from any call to a video transmit call. + [CHAR LIMIT=NONE] --> + <string name="description_target_accept_upgrade_to_video_transmit_request">Accept video transmit request</string> + <!-- Description of the target to decline a request to upgrade from any call to a video transmit call. + [CHAR LIMIT=NONE] --> + <string name="description_target_decline_upgrade_to_video_transmit_request">Decline video transmit request</string> + <!-- Description of the target to accept a request to upgrade from any call to a video receive call. + [CHAR LIMIT=NONE] --> + <string name="description_target_accept_upgrade_to_video_receive_request">Accept video receive request</string> + <!-- Description of the target to decline a request to upgrade from any call to a video receive call. + [CHAR LIMIT=NONE] --> + <string name="description_target_decline_upgrade_to_video_receive_request">Decline video receive request</string> <!-- Description of the up direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] --> <string name="description_direction_up">Slide up for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string> @@ -417,4 +455,26 @@ <!-- This can be used in any application wanting to disable the text "Emergency number" --> <string name="emergency_call_dialog_number_for_display">Emergency number</string> + + <!-- STOPSHIP These strings are for debugging only --> + <!-- Call substate label --> + <string name="call_substate_label" translatable="false">Call substate - \u000a</string> + <!-- Call substate label for call resumed --> + <string name="call_substate_call_resumed" translatable="false">Resumed \u000a</string> + <!-- Call substate label for call connected suspended (audio) --> + <string name="call_substate_connected_suspended_audio" translatable="false">Connected Suspended (Audio) \u000a</string> + <!-- Call substate label for call connected suspended (video) --> + <string name="call_substate_connected_suspended_video" translatable="false">Connected Suspended (Video) \u000a</string> + <!-- Call substate label for avp retry --> + <string name="call_substate_avp_retry" translatable="false">Avp Retry \u000a</string> + <!-- Video quality changed message --> + <string name="video_quality_changed" translatable="false">Video quality changed to \u0020</string> + <!-- Video quality High --> + <string name="video_quality_high" translatable="false">High</string> + <!-- Video quality Medium --> + <string name="video_quality_medium" translatable="false">Medium</string> + <!-- Video quality Low --> + <string name="video_quality_low" translatable="false">Low</string> + <!-- Video quality Unknown --> + <string name="video_quality_unknown" translatable="false">Unknown</string> </resources> |