diff options
author | Tyler Gunn <tgunn@google.com> | 2015-05-05 12:22:38 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2015-05-05 12:22:38 -0700 |
commit | b040158d7bb2f5c7d06bd2c1db5e96adafbcff3e (patch) | |
tree | 575325aa5b00fbeef17e3cfd00271751bdc0bab3 /InCallUI/res | |
parent | 99e4144119af04c2269bc3c6f1151c1be9714857 (diff) |
DO NOT MERGE Video call upgrade/dowgrade request changes.
- fixed potential NPE in VideoCallFragment when setting preview size.
- moved photo load into the postExecute for the async task -- it is
already threaded and I was seeing intermittent concurrency issues.
- Changed CallButtonFragment to retrieve max # of buttons from config.xml.
- Added override for wider screens (e.g. N6 and wider) to show an extra
button.
- Reorganized call buttons so that the "Camera on/off" button is adjacent
to the flip camera button.
- Changed answer Glowpad to pass correct video state so that accepting a
video request uses the correct state (important for accepting requests to
turn camera back on).
- added new Session modification state REQUEST_REJECTED for when the remote
user explicitly declines the request. This is used to trigger a
"video request rejected" message when the remote party rejects the
request.
Bug: 20257400
Change-Id: Ibe25eb045ee868748f91bf411f285629d36ebcd2
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/layout/call_button_fragment.xml | 14 | ||||
-rw-r--r-- | InCallUI/res/layout/call_card_fragment.xml | 7 | ||||
-rw-r--r-- | InCallUI/res/values-sw410dp/config.xml | 21 | ||||
-rw-r--r-- | InCallUI/res/values/array.xml | 51 | ||||
-rw-r--r-- | InCallUI/res/values/config.xml | 20 | ||||
-rw-r--r-- | InCallUI/res/values/strings.xml | 4 |
6 files changed, 64 insertions, 53 deletions
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index 17c2d7c78..0cdaf23f7 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -122,6 +122,13 @@ <!-- This slot is either "Add" or "Merge", depending on the state of the call. One or the other of these must always be set to GONE. --> + <!-- "Turn off camera" for video calls. --> + <ToggleButton android:id="@+id/pauseVideoButton" + style="@style/InCallCompoundButton" + android:background="@drawable/btn_compound_video_off" + android:contentDescription="@string/onscreenPauseVideoText" + android:visibility="gone" /> + <!-- "Add Call" --> <ImageButton android:id="@+id/addButton" style="@style/InCallButton" @@ -138,13 +145,6 @@ android:contentDescription="@string/onscreenMergeCallsText" android:visibility="gone" /> - <!-- "Turn off camera" for video calls. --> - <ToggleButton android:id="@+id/pauseVideoButton" - style="@style/InCallCompoundButton" - android:background="@drawable/btn_compound_video_off" - android:contentDescription="@string/onscreenPauseVideoText" - android:visibility="gone" /> - <!-- "Overflow" --> <ImageButton android:id="@+id/overflowButton" style="@style/InCallButton" diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index 1971c9c70..a21ed20d8 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -80,6 +80,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" /> + <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> <FrameLayout android:id="@+id/progressSpinner" diff --git a/InCallUI/res/values-sw410dp/config.xml b/InCallUI/res/values-sw410dp/config.xml new file mode 100644 index 000000000..a57f86784 --- /dev/null +++ b/InCallUI/res/values-sw410dp/config.xml @@ -0,0 +1,21 @@ +<!-- + ~ 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. + ~ 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 + --> + +<resources> + <!-- Determines the maximum number of buttons visible on the call card. Any buttons over this + count are put into the overflow menu. --> + <integer name="call_card_max_buttons">6</integer> +</resources>
\ No newline at end of file diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml index 2e38c2c46..7877ec8f3 100644 --- a/InCallUI/res/values/array.xml +++ b/InCallUI/res/values/array.xml @@ -112,61 +112,24 @@ <item>@string/description_direction_down</item> </array> - - <!-- For upgrade to video from VOLTE to VT (Tx/Rx/Bidirectional) in an active video call. + <!-- For accept/reject upgrade to video in active video call - Accept upgrade to video request (drag right) - - Decline upgrade to video request (drag left) - - Answer as audio call (drag down) --> - <array name="incoming_call_widget_video_upgrade_request_targets"> + - Decline upgrade to video request (drag left)--> + <array name="incoming_call_widget_video_request_targets"> <item>@drawable/ic_lockscreen_answer_video</item> - <item>@null</item> - <item>@drawable/ic_lockscreen_decline</item> - <item>@drawable/ic_lockscreen_answer</item> + <item>@drawable/ic_lockscreen_decline_video</item> </array> - <array name="incoming_call_widget_video_upgrade_request_target_descriptions"> + + <array name="incoming_call_widget_video_request_target_descriptions"> <item>@string/description_target_accept_upgrade_to_video_request</item> <item>@null</item> <item>@string/description_target_decline_upgrade_to_video_request</item> <item>@null</item>" </array> - <array name="incoming_call_widget_video_upgrade_request_target_direction_descriptions"> + <array name="incoming_call_widget_video_request_target_direction_descriptions"> <item>@string/description_direction_right</item> <item>@null</item> <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) - 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_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_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_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_request</item> - <item>@string/description_target_decline_upgrade_to_video_request</item> - </array> - </resources> diff --git a/InCallUI/res/values/config.xml b/InCallUI/res/values/config.xml new file mode 100644 index 000000000..8acbd5910 --- /dev/null +++ b/InCallUI/res/values/config.xml @@ -0,0 +1,20 @@ +<!-- + ~ 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. + ~ 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 + --> +<resources> + <!-- Determines the maximum number of buttons visible on the call card. Any buttons over this + count are put into the overflow menu. --> + <integer name="call_card_max_buttons">5</integer> +</resources>
\ No newline at end of file diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index f913f68a4..c985a8cc7 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -114,8 +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: status label when the remote party rejects a video call request. --> + <string name="card_title_video_call_rejected">Video request rejected</string> <!-- In-call screen: string shown to the user when their outgoing number is different than the number reported by TelephonyManager#getLine1Number() --> |