diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-05-05 12:22:38 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2015-05-06 15:59:03 +0000 |
| commit | b0cf72eaa629a438a939dec34b2f7436416e045e (patch) | |
| tree | e140bf0926cbd485f0a55a93e989415049dbd023 /InCallUI/res/layout/call_button_fragment.xml | |
| parent | 4e706622923b412228d2537e521b926b9b56a171 (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
(cherry picked from commit 1a723f1586c812510bd0791a4ef8420d36f83cf9)
Diffstat (limited to 'InCallUI/res/layout/call_button_fragment.xml')
| -rw-r--r-- | InCallUI/res/layout/call_button_fragment.xml | 14 |
1 files changed, 7 insertions, 7 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" |