From 1be65f37ee70f1b849a8447dbdfb55f43e047af3 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Fri, 10 Apr 2015 12:31:23 -0700 Subject: Cleanup AnswerFragment glowpad UI * For incoming video requests, only show answer as video, answer as audio, or reject * For upgrade requests, only show upgrade to video, don't upgrade to video * Nuke unused tx/rx only assets Bug: 20090411 Change-Id: I51093bb702981256809020908442eb98b0d17606 --- InCallUI/res/values/array.xml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'InCallUI/res/values') 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 @@ @null @drawable/ic_lockscreen_decline @drawable/ic_lockscreen_answer_video - @drawable/ic_lockscreen_answer_tx_video - @drawable/ic_lockscreen_answer_rx_video @string/description_target_answer_video_call @@ -100,8 +98,6 @@ @drawable/ic_lockscreen_text @drawable/ic_lockscreen_decline @drawable/ic_lockscreen_answer - @drawable/ic_lockscreen_answer_tx_video - @drawable/ic_lockscreen_answer_rx_video @string/description_target_answer_video_call @@ -126,8 +122,6 @@ @null @drawable/ic_lockscreen_decline @drawable/ic_lockscreen_answer - @drawable/ic_lockscreen_answer_tx_video - @drawable/ic_lockscreen_answer_rx_video @string/description_target_accept_upgrade_to_video_request @@ -152,26 +146,27 @@ + - Decline upgrade to video request (drag left) + TODO: This should be automatically rejected in the lower layers --> - @drawable/ic_lockscreen_answer_tx_video + @drawable/ic_lockscreen_answer_video @drawable/ic_lockscreen_decline - @string/description_target_accept_upgrade_to_video_transmit_request - @string/description_target_decline_upgrade_to_video_transmit_request + @string/description_target_accept_upgrade_to_video_request + @string/description_target_decline_upgrade_to_video_request - @drawable/ic_lockscreen_answer_rx_video + @drawable/ic_lockscreen_answer_video @drawable/ic_lockscreen_decline - @string/description_target_accept_upgrade_to_video_receive_request - @string/description_target_decline_upgrade_to_video_receive_request + @string/description_target_accept_upgrade_to_video_request + @string/description_target_decline_upgrade_to_video_request -- cgit v1.2.3 From 439365a9477ee0dfbc4ac0933db13a1614edd597 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Fri, 10 Apr 2015 17:52:04 -0700 Subject: Simplify and rewire in-call buttons * Fix bug where the switch camera option was never shown * Fix bug where dialpad button was shown for video calls * Move management of call button's actual visiblity into the CallCardFragment. The CallCardPresenter is in charge of deciding what functionality is available, but the CallCardFragment manages the actual UI that is displayed. * Simplify code that collapses call button functionality into the overflow button. Any buttons that would cause the total number of buttons to exceed the given threshold will be collapsed into an overflow menu. * Dynamically toggle the contentDescription of the hold button. This is used for both accessibility as well as generating the menu option if the button is collapsed into the overflow menu * Removed some now unused strings and code. Bug: 20127747 Bug: 20127925 Bug: 20090502 Change-Id: I33fda7ad74af926d8c3a507bff8f3c69c19ea57e --- InCallUI/res/values/strings.xml | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'InCallUI/res/values') 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 --> Use keyboard to dial - - Hold call - - Resume call - - Add call - - Merge calls - - Swap calls - - Manage Conference - - - Hold + + Hold Call + + Resume Call - End + End Call Dialpad @@ -456,7 +447,7 @@ Emergency number - + Call substate - \u000a -- cgit v1.2.3 From 53485a55bfbccc8fe822739f553fc467dc0b1119 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Tue, 31 Mar 2015 09:55:54 -0700 Subject: Video calling landscape changes to match specs * Call card has 4dp corners, and is 90% visible * Margins for call card * Call buttons are center aligned with end call button * Remote surface is always center aligned, tapping call card slides it in and out * Status bar is black Bug: 19668216 Change-Id: Ifea27faa5f8ff32f6be13e777ca70aa4d0c7727e --- InCallUI/res/values/colors.xml | 2 ++ InCallUI/res/values/dimens.xml | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'InCallUI/res/values') 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 @@ @color/dialer_theme_color + + @color/dialer_theme_color #33999999 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 @@ --> + + false +