diff options
Diffstat (limited to 'InCallUI/res')
16 files changed, 82 insertions, 246 deletions
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml b/InCallUI/res/drawable-land/rounded_call_card_background.xml index 750ef5e26..f41ecda79 100644 --- a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml +++ b/InCallUI/res/drawable-land/rounded_call_card_background.xml @@ -1,8 +1,7 @@ <?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 + ~ Copyright (C) 2015 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. @@ -16,13 +15,9 @@ ~ 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> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@color/incall_call_banner_background_color" /> + <corners + android:radius="4dp" /> +</shape>
\ No newline at end of file diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml deleted file mode 100644 index c5a41d814..000000000 --- a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml deleted file mode 100644 index 5efd3d142..000000000 --- a/InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?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 deleted file mode 100644 index 15d11978e..000000000 --- a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml deleted file mode 100644 index b0ad943dc..000000000 --- a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_normal_layer.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?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_fragment.xml b/InCallUI/res/layout-land/call_card_fragment.xml index cdee27970..89466152a 100644 --- a/InCallUI/res/layout-land/call_card_fragment.xml +++ b/InCallUI/res/layout-land/call_card_fragment.xml @@ -30,22 +30,25 @@ android:layout_height="match_parent" android:orientation="vertical" android:elevation="@dimen/primary_call_elevation" - android:background="@color/incall_call_banner_background_color" + android:background="@drawable/rounded_call_card_background" android:paddingTop="@dimen/call_banner_primary_call_container_top_padding" android:clipChildren="false" - android:clipToPadding="false" > + android:clipToPadding="false" + android:alpha="0.9" + android:layout_margin="10dp"> <include layout="@layout/primary_call_info" /> - <fragment android:name="com.android.incallui.CallButtonFragment" - android:id="@+id/callButtonFragment" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - <FrameLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="match_parent" > + <fragment android:name="com.android.incallui.CallButtonFragment" + android:id="@+id/callButtonFragment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginBottom="@dimen/call_buttons_bottom_margin" /> <!-- Secondary "Call info" block, for the background ("on hold") call. --> <include layout="@layout/secondary_call_info" android:layout_width="match_parent" @@ -73,14 +76,6 @@ 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" - android:visibility="gone" /> - <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> <FrameLayout android:id="@+id/progressSpinner" @@ -102,7 +97,14 @@ </FrameLayout> - <!-- Placeholder for various fragments that are added dynamically underneath the caller info. --> + <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" /> + + <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. --> <FrameLayout android:id="@+id/answer_and_dialpad_container" android:layout_toEndOf="@id/primary_call_info_container" diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index 604d79e60..3629b8a3b 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -67,7 +67,8 @@ <ToggleButton android:id="@+id/audioButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_audio" - android:contentDescription="@string/audio_mode_speaker" /> + android:contentDescription="@string/audio_mode_speaker" + android:visibility="gone" /> <!-- "Change to audio call" for video calls. --> <ImageButton android:id="@+id/changeToVoiceButton" @@ -82,7 +83,8 @@ <ToggleButton android:id="@+id/muteButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_mute" - android:contentDescription="@string/onscreenMuteText" /> + android:contentDescription="@string/onscreenMuteText" + android:visibility="gone" /> <!-- CENTER SLOT ======================================================================= --> @@ -90,7 +92,8 @@ <ToggleButton android:id="@+id/dialpadButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_dialpad" - android:contentDescription="@string/onscreenShowDialpadText" /> + android:contentDescription="@string/onscreenShowDialpadText" + android:visibility="gone" /> <!-- MIDDLE RIGHT SLOT ================================================================= --> @@ -101,7 +104,8 @@ <ToggleButton android:id="@+id/holdButton" style="@style/InCallCompoundButton" android:background="@drawable/btn_compound_hold" - android:contentDescription="@string/onscreenHoldText" /> + android:contentDescription="@string/onscreenHoldText_unselected" + android:visibility="gone" /> <!-- "Swap" (or "Manage calls" in some CDMA states) --> <ImageButton android:id="@+id/swapButton" diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index 615744c79..d28ffe018 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -93,6 +93,13 @@ </FrameLayout> + <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" /> + <!-- Secondary "Call info" block, for the background ("on hold") call. --> <include layout="@layout/secondary_call_info" /> diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml index 85eef0ee1..e866795a6 100644 --- a/InCallUI/res/layout/secondary_call_info.xml +++ b/InCallUI/res/layout/secondary_call_info.xml @@ -40,6 +40,13 @@ android:paddingBottom="@dimen/secondary_call_info_vertical_padding" android:background="?android:attr/selectableItemBackground"> + <ImageView android:id="@+id/secondaryCallVideoCallIcon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_toolbar_video" + android:tint="@color/incall_banner_secondary_text_color" + android:paddingEnd="16dp"/> + <ImageView android:id="@+id/secondaryCallConferenceCallIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/InCallUI/res/menu/incall_overflow_menu.xml b/InCallUI/res/menu/incall_overflow_menu.xml deleted file mode 100644 index 2de858711..000000000 --- a/InCallUI/res/menu/incall_overflow_menu.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ 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 - --> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/overflow_merge_menu_item" - android:title="@string/overflowMergeMenuItemText" /> - - <item android:id="@+id/overflow_add_menu_item" - android:title="@string/overflowAddMenuItemText" /> - - <item android:id="@+id/overflow_hold_menu_item" - android:title="@string/overflowHoldMenuItemText" /> - - <item android:id="@+id/overflow_resume_menu_item" - android:title="@string/overflowResumeMenuItemText" /> - - <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/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml b/InCallUI/res/values-land/colors.xml index c1dca4d06..77eea2e68 100644 --- a/InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml +++ b/InCallUI/res/values-land/colors.xml @@ -1,8 +1,6 @@ <?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 + ~ Copyright (C) 2015 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. @@ -16,13 +14,8 @@ ~ 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> + +<resources> + <!-- Background color for status bar. For portrait this will be ignored. --> + <color name="statusbar_background_color">#000000</color> +</resources> diff --git a/InCallUI/res/values-land/dimens.xml b/InCallUI/res/values-land/dimens.xml index d992ccdea..59a5a9a87 100644 --- a/InCallUI/res/values-land/dimens.xml +++ b/InCallUI/res/values-land/dimens.xml @@ -16,6 +16,11 @@ --> <resources> + <!-- Whether or not the landscape mode layout is currently being used --> + <bool name="is_layout_landscape">true</bool> <!-- Height and width of the in-call buttons. --> <dimen name="in_call_button_dimension">40dp</dimen> + <!-- Margin underneath the call buttons. This is used only in landscape mode and is sized + so that the call buttons are center aligned with the end call button. --> + <dimen name="call_buttons_bottom_margin">30dp</dimen> </resources> diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml index 46592e126..2e38c2c46 100644 --- a/InCallUI/res/values/array.xml +++ b/InCallUI/res/values/array.xml @@ -74,8 +74,6 @@ <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> @@ -100,8 +98,6 @@ <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> @@ -126,8 +122,6 @@ <item>@null</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_upgrade_request_target_descriptions"> <item>@string/description_target_accept_upgrade_to_video_request</item> @@ -152,26 +146,27 @@ <!-- 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)--> + - Decline upgrade to video request (drag left) + TODO: This should be automatically rejected in the lower layers --> <array name="incoming_call_widget_video_transmit_accept_reject_request_targets"> - <item>@drawable/ic_lockscreen_answer_tx_video</item> + <item>@drawable/ic_lockscreen_answer_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> + <item>@string/description_target_accept_upgrade_to_video_request</item> + <item>@string/description_target_decline_upgrade_to_video_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_answer_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> + <item>@string/description_target_accept_upgrade_to_video_request</item> + <item>@string/description_target_decline_upgrade_to_video_request</item> </array> </resources> diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index afc557bc1..cac382deb 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -59,6 +59,8 @@ <!-- Background color of action bars --> <color name="actionbar_background_color">@color/dialer_theme_color</color> + <!-- Background color for status bar. For portrait this will be ignored. --> + <color name="statusbar_background_color">@color/dialer_theme_color</color> <color name="translucent_shadow">#33999999</color> diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index 43307e8db..0739234f2 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -16,6 +16,9 @@ --> <resources> + <!-- Whether or not the landscape mode layout is currently being used --> + <bool name="is_layout_landscape">false</bool> + <!-- Dimensions for CallCard elements (the normal in-call UI) --> <!-- Height of the "call banner" overlay on top of the upper part of the call info area. @@ -67,7 +70,7 @@ <dimen name="dialpad_digits_adjustable_height">50dp</dimen> <dimen name="dialpad_key_numbers_size">36dp</dimen> - <dimen name="floating_action_bar_vertical_offset">-24dp</dimen> + <dimen name="floating_action_button_vertical_offset">-24dp</dimen> <dimen name="call_button_margin_vertical">8dp</dimen> <dimen name="call_button_margin_horizontal">6dp</dimen> diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 99b8111bb..cfe3d41ab 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -255,23 +255,14 @@ to dial using the physical keyboard --> <string name="dialerKeyboardHintText">Use keyboard to dial</string> - <!-- Text for the overflow "Hold call" menu item. --> - <string name="overflowHoldMenuItemText">Hold call</string> - <!-- Text for the overflow "Resume call" menu item. --> - <string name="overflowResumeMenuItemText">Resume call</string> - <!-- Text for the overflow "Add call" menu item. --> - <string name="overflowAddMenuItemText">Add call</string> - <!-- Text for the onscreen "Merge calls" menu item. --> - <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> + <!-- Text for the onscreen "Hold" button when it is not selected. Pressing it will put + the call on hold. --> + <string name="onscreenHoldText_unselected">Hold Call</string> + <!-- Text for the onscreen "Hold" button when it is selected. Pressing it will resume + the call from a previously held state. --> + <string name="onscreenHoldText_selected">Resume Call</string> <!-- Text for the onscreen "End call" button --> - <string name="onscreenEndCallText">End</string> + <string name="onscreenEndCallText">End Call</string> <!-- Text for the onscreen "Show Dialpad" button --> <string name="onscreenShowDialpadText">Dialpad</string> <!-- Text for the onscreen "Mute" button --> @@ -456,7 +447,7 @@ <!-- 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 --> + <!-- 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 --> |