summaryrefslogtreecommitdiff
path: root/InCallUI
AgeCommit message (Collapse)Author
2015-03-26merge changes from m-wirelessYorke Lee
Change-Id: Id93b2d6e840baaa0b9b42b4595bca0dc41972994
2015-03-25Merge "Fix NPE in endCallClicked"Jay Shrauner
2015-03-25Fix NPE in showDialpadFragmentJay Shrauner
Check for null ProximitySensor Bug:19931065 Change-Id: I33b72552260f4b670457ea0ba6e30e5b4819f636
2015-03-25Fix NPE in endCallClickedJay Shrauner
Save the call id before setting disconnect state in case a state change callback causes the primary call object to be cleared. Bug:19893538 Change-Id: Ib6583bfb25023bf514ee073e4970b18844d8561b
2015-03-25Don\'t show SSID for Wi-Fi calls.Andrew Lee
automerge: 1a3d05d * commit '1a3d05dc126773f0e0d32135f9b1018f1a4c8b5e': Don't show SSID for Wi-Fi calls.
2015-03-25Dynamically add/remove CallCardFragmentYorke Lee
Only show the CallCardFragment when it is needed: 1) Incoming calls 2) After completion of circular reveal Also make Calls class public so that it can be mocked with Mockito Change-Id: Ife7ed38bde25daf5a9fd0329ade5e794fa1bff65
2015-03-24Don't show SSID for Wi-Fi calls.Andrew Lee
- Delete wifi icon and method to get SSID. + Use labels provided by StatusHints instead. I'm not very happy with the additional "isWifi" cases I ended up adding in call card fragment. I felt this was necessary because of assumptions in some cases that if a label is provided, it should be formatted as a phone account source. While this was true before, it's becoming less so. I feel like the fragment shouldn't have to worry about formatting or choosing the label based on the call and conditions. It should just display the label if it thinks it is appropriate to show a label given the call state. To fix that, it seems like logic should be moved to the presenter instead, and possibly to Telephony. But, I'm hesitant to do that until these WFC changes back merge to master because of potential merge conflicts and its slightly more risky for this branch, because it starts dealing with logic/flows outside of WFC.. Bug: 19866988 Change-Id: Iacd5a09259c84ea7be28b0170ae603eb9561f7ca
2015-03-24Merge "Fix for misaligned video view surface"Yorke Lee
2015-03-23Fix for misaligned video view surfaceYorke Lee
* Stash the true height of mPrimaryCallCardContainer in a view tag so that its height is not misreported during the outgoing call animation * Move the onGlobalLayoutListener so that the callbacks occur after the surfaces have been inflated, to ensure the views are non-null. Bug: 19773495 Change-Id: Ib762285c595ec826c6da15296db66d830d9fe24e
2015-03-23Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I2b2b12738a83b658730532a76df43a2b692dbf4f Auto-generated-cl: translation import
2015-03-21Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I0b655391efae2a593ae2cd40f1ff6fe132de78ce Auto-generated-cl: translation import
2015-03-20DO NOT MERGE Don't hide caller photo for video callYorke Lee
Bug: 19728020 Change-Id: I6e5259c63553de9e5060621bcc749d1039b67ea1
2015-03-20Merge "Don't hide caller photo for video call"Yorke Lee
2015-03-19Finish activity before reveal if not setup.Andrew Lee
automerge: c5722b4 * commit 'c5722b4638a4807a3accbd85822eeb7c09973c44': Finish activity before reveal if not setup.
2015-03-19Don't add multiple instances of CircularRevealFragmentYorke Lee
Certain calls can propagate state changes immediately after the call is made, causing InCallActivity.internalResolveIntent to be called twice in succession. If multiple animations are run the UI is left in an inconsistent state. Bug: 19842284 Change-Id: Ie6060a37d2bd7775731e0e82019bb8baf0ffd834
2015-03-19Finish activity before reveal if not setup.Andrew Lee
This seems to be happening because it tries to start the circular reveal before the InCallPresenter has been configured to start a call. This is an error case; finish the activity to try to resolve it more gracefully. Bug: 19719403 Change-Id: I83240b88b7015d8709d5b4cb56a099a68c9c15ca
2015-03-18Merge "Set correct style for AlertDialog"Yorke Lee
2015-03-18Merge "Add VideoCallFragment back into InCallUI"Yorke Lee
2015-03-18Set correct style for AlertDialogYorke Lee
Otherwise it inherits the incorrect text color <item name="android:textColorPrimary">@color/incall_call_banner_text_color</item> from Theme.InCallScreen. Bug: 19796458 Change-Id: I4e86f4a114b39d8c2060638eb05142791385c8e9
2015-03-18Delete unused images and strings.Andrew Lee
Bug: 19536005 Change-Id: I50604ef59625fcac43deb3e5606dbae8ebb25ad5
2015-03-18Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I8a19823dade76231361ae84ef5df6f2356cf04f3 Auto-generated-cl: translation import
2015-03-17Don't hide caller photo for video callYorke Lee
Bug: 19728020 Change-Id: I6e5259c63553de9e5060621bcc749d1039b67ea1
2015-03-17Add VideoCallFragment back into InCallUIYorke Lee
Statically add VideoCallFragment into the view hierarchy so that video calls can be shown in the UI. Change-Id: I8afbaaa750371a4afe3946d268882f46f5ec7eb4
2015-03-16Size CallCard correctly in landscape modeYorke Lee
Bug: 19668216 Change-Id: Ifd131f3d200a66a1f08dff3db131c551d9890c09
2015-03-16Merge "Dynamically add AnswerFragment"Yorke Lee
2015-03-16Merge "Don't crash when rotating during video call"Yorke Lee
2015-03-16Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I0ecf79a43fc0e9bccf40db00aebab84af400d7ae Auto-generated-cl: translation import
2015-03-16Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande
Change-Id: I9f37386b36eeee2afffb20464265f92d5c5942d3
2015-03-13Dynamically add AnswerFragmentYorke Lee
AnswerPresenter is a little tricky because it is in charge of responding to incoming calls, so we want it to be alive and getting onIncomingCall callbacks, but we don't want to create an instance of AnswerFragment, which it is dependent on. Move some dependencies around so that AnswerPresenter is created by InCallPresenter instead. It registers for callbacks via InCallPresenter instead of directly to CallList, and shows/hides the AnswerFragment via InCallActivity. Change-Id: I7026150988bf3cda762dda8a319f48e1af132361
2015-03-13Don't crash when rotating during video callYorke Lee
If mTextureView has not changed across recreation, don't set the texture and listeners. Change-Id: I704abf6c9a6197d51233567c4ff2bd1e19393a95
2015-03-13Video Call Upgrade/Downgrade fixesMatthieu Baglin
This is fixing multiple deficiencies affecting video call upgrade or downgrade in the L MR1 InCallUi. Change-Id: I61bf7efa6ac23859c900dfd059faf72184987943 Signed-off-by: Matthieu Baglin <matthieu.baglin@intel.com>
2015-03-11Fix emergency callback number not shown for incoming calls.Tyler Gunn
- In CallCardPresenter#setCallbackNumber() check for the case where a call has CAPABILITY_SHOW_CALLBACK_NUMBER. Use this to trigger showing the Emergency Callback Number (the ECM is only shown on outgoing calls if the user has a dark number). Bug: 18689292 Change-Id: I94391e3be3360982742ce961272b680d0eaa32a5
2015-03-11Remove unused translations with no base string.Andrew Lee
These strings don't have default translations in the strings.xml file. Bug: 19536005 Change-Id: I050eded1214470546b946834264a6d04d1cf2fdc
2015-03-11Correct capitaliztion of "wi-fi" to "Wi-Fi".Andrew Lee
automerge: 5f2de0f * commit '5f2de0f118c1b40ebbd4329c66722f907c396163': Correct capitaliztion of "wi-fi" to "Wi-Fi".
2015-03-11Correct capitaliztion of "wi-fi" to "Wi-Fi".Andrew Lee
Change-Id: I4ce0898dbae20ac26d1e12db9e9aa094c537e230
2015-03-11Indicate wifi for incoming calls.Andrew Lee
automerge: 6c5be77 * commit '6c5be778579619d055f6d12f381a63568bd8270d': Indicate wifi for incoming calls.
2015-03-10Indicate wifi for incoming calls.Andrew Lee
This is done in the call card by showing the wifi icon. This is done in the notification, by change the subtext. For international calls in particular, this helps users understand how accepting a phone call will affect the cost of their call. Change-Id: Ifebd9f9cc8598b7fe5b693673b27a485f7ecdf0f
2015-03-10InCallUi basic video call fixesMatthieu Baglin
This patch resolves some issues in video call establishment on L MR1 InCallUi. Change-Id: Ib72894f7e81932200b09b9995d169ef1124fc5b5 Signed-off-by: Matthieu Baglin <matthieu.baglin@intel.com>
2015-03-10Merge "Flesh out more InCall tests"Yorke Lee
2015-03-09Standardize naming of methods and fix a typoYorke Lee
Change-Id: I9b294ab9f483bb5e7af149ff6054cd8cd667adca
2015-03-09Set the camera to null when preview surface is destroyedMatthieu Baglin
When the video call is disconnected, the camera would still be opened without this fix. Signed-off-by: Matthieu Baglin <matthieu.baglin@intel.com> Change-Id: Ie69fb87412c53e4c6072d998d3e3b067c4c8ba0f
2015-03-09Merge "Improve InCallUI fragment management"Yorke Lee
2015-03-09Improve InCallUI fragment managementYorke Lee
* Load some fragments on demand * ConferenceManagerFragment * DialpadFragment * Remove ConferenceManagerFragment from incall_screen.xml so that it is no longer loaded statically * Add helper methods to InCallActivity to facilitate dynamically loading fragments * Fix some bugs with fragment visibility and activity recreation Change-Id: I475e2302fae415817f06da209dd6484c89467480
2015-03-09Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ie3c36dfc79d576e5db2ada547e1076709a3ba57a Auto-generated-cl: translation import
2015-03-06Flesh out more InCall testsYorke Lee
Change-Id: If77e0767e9dbc65a9235dc1841f4d7298e4d39d5
2015-03-05Add tests for InCallPresenterYorke Lee
Add a bunch of end-to-end tests for InCallPresenter Refactor InCallPresenter to be more dependency injection friendly. Add some test-only methods to make testing easier Change-Id: I86b6eeff91d35bc3b5cb3de9262d8850673919b7
2015-03-05Merge "Remove CircularRevealActivity"Yorke Lee
2015-03-04Remove CircularRevealActivityYorke Lee
Replace CircularRevealActivity with a fragment that is tied to the lifecycle of InCallActivity so that InCallActivity is the only activity that is involved in the outgoing call process. Simplify some of the intent creation logic that is used to launch InCallActivity since we no longer need some of the flags that were currently provided via various method overloads in InCallPresenter.getAnimationIntent and getInCallIntent. To further simplify this CL, a very rudimentary approach is taken to track the state where we are starting up the UI but haven't received a call from Telecom yet. This is done by a boolean flag set on the InCallPresenter: mBoundAndWaitingForOutgoingCall. Further changes will build upon and improve this. Also set most elements inside primary_call_info.xml to visibility: GONE by default to fix some animation jank where a empty but not GONE view would continue to take up space. Change-Id: Ic70857685680af6868d4b2153d942d73eef3ca56
2015-03-02Merge "Don't hide dialpad when disconnecting"Yorke Lee
2015-03-02Standardize use of CallList in InCallPresenterYorke Lee
Always use mCallList instead of CallList.getInstance Change-Id: Ied182f41a219066ac16cb9d6b7c828994440b522
2015-03-02Merge "Add InCallUI tests folder and basic test"Yorke Lee
2015-03-02Merge "Update some comments in InCallActivity"Yorke Lee
2015-03-02Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ica394a87ebc7fcb9af21a449b2b91918599a23f0 Auto-generated-cl: translation import
2015-02-27Add InCallUI tests folder and basic testYorke Lee
Change-Id: I3a8f03dfca5db1b7012e48e2b5dd7bd6b9dc4f3d
2015-02-27Don't hide dialpad when disconnectingYorke Lee
This was originally needed because the dialpad was full screen and would obscure the call status when ending the call. This is no longer true with the L dialer and the dialpad sliding animation when the call is ended looks weird. Change-Id: Id78c2bef3470066b9e8e86bce0c6f431df5adde2
2015-02-27Update some comments in InCallActivityYorke Lee
Change-Id: I9fce3fbd1fa51a6a0489de2d97691fc8e4aa143c
2015-02-28Merge "Remove unnecessary comment"Yorke Lee
2015-02-27Remove unnecessary commentYorke Lee
Change-Id: I9112172bf9a5c9a236557e1a75264046f322e451
2015-02-26Merge "InCall code cleanup"Yorke Lee
2015-02-25Merge "Remove use of ttsSpanAsPhoneNumber"Yorke Lee
2015-02-23Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I24b20c6d169fe642dcceb61d356d0455c3031980 Auto-generated-cl: translation import
2015-02-20InCall code cleanupYorke Lee
Clean up of some unused and deprecated code Change-Id: I7c78584f6cdc5dd223bbf793a4ec58f04c049398
2015-02-20Remove use of ttsSpanAsPhoneNumberYorke Lee
This API is deprecated (and hidden) Change-Id: Ie1fe6ed8c2aff4288c41b15a95da45090009df4b
2015-02-20Merge "Remove unnecessary HoverIgnoringLinearLayout"Yorke Lee
2015-02-20Remove unnecessary HoverIgnoringLinearLayoutYorke Lee
DialpadView already implements the necessary behavior Change-Id: Ie4eb0b88a8c7d7e78564e23ebc13108a74cb1b9c
2015-02-19Fix for solid blue screen if CircularRevealActivity is not finishedYorke Lee
If the ActivityManager doesn't finish and destroy CircularRevealActivity automatically it can trigger onNewIntent on the activity instead of onCreate the next time a call is started. Make sure to handle that case as well. Bug: 19428365 Change-Id: If051ebd449a7deddfdc60ae856e9e1a0f3cda77d
2015-02-18Show icon and network label when using Wifi.Andrew Lee
+ Add Wifi icon and network label, to be shown when CAPABILITY_WIFI is present on the primary call. Assume we can infer the network label from the connection info returned by the WifiManager, supposing that the phone can only be connected to one wifi network. + Add helper to strip quotation marks from wifi network name. + Reposition HD audio icon beneath the name, and to the left of the number/location information. + Adjust assets and layout of call state and hd audio icons, to center them in a more visually pleasing way in the view. Bug: 19151850 Change-Id: Ic23d1e744960e80b65bc34a8e709266af508fe21
2015-02-18Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ibbf2f5a9d2cd1e50f3b2fde1cc362e06da51ea14 Auto-generated-cl: translation import
2015-02-11Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I863aaf46d063b3a8b9c54174cac2ef00ba031f57 Auto-generated-cl: translation import
2015-01-28Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I5f3d5d2d60ba42c5144d24596d0b514990de847e Auto-generated-cl: translation import
2015-01-26am 93970c64: am 624f4b74: am 73be6292: Merge "Hide emergency callback number ↵Nancy Chen
when slot2 SIM is default." into lmp-mr1-dev * commit '93970c644291a3dcfd55e456b48b338a6110b5f7': Hide emergency callback number when slot2 SIM is default.
2015-01-26am 624f4b74: am 73be6292: Merge "Hide emergency callback number when slot2 ↵Nancy Chen
SIM is default." into lmp-mr1-dev * commit '624f4b746592dbf39382842d8cdab78527c057ce': Hide emergency callback number when slot2 SIM is default.
2015-01-26Merge "Hide emergency callback number when slot2 SIM is default." into ↵Nancy Chen
lmp-mr1-dev
2015-01-24Hide emergency callback number when slot2 SIM is default.Nancy Chen
Because emergency calls are always made from the SIM in slot1, when slot2 has the SIM set for default outgoing call, the InCallUI currently thinks the emergency callback number is different from the number being called from (the code only uses the default number). The fix is to check the line 1 number of the phone account being used instead of the default phone account. Bug: 19087382 Change-Id: I90a096f63493affea979689c7ad188eec7109c08
2015-01-22am 72d03649: am a1c9ef02: Merge "Ensure sim color is shown on multi-sim ↵Tyler Gunn
devices when only one sim installed." into lmp-mr1-dev * commit '72d036495812e503c56cbfbea8d722c21a74288e': Ensure sim color is shown on multi-sim devices when only one sim installed.
2015-01-22Merge "Ensure sim color is shown on multi-sim devices when only one sim ↵Tyler Gunn
installed." into lmp-mr1-dev
2015-01-20am 21ed7890: am df4ae400: am 25a7b6eb: Merge "Remove padding from call ↵Nancy Chen
buttons to fix undesired cropping." into lmp-mr1-dev * commit '21ed7890c005452705d544ff9f004d553742dc89': Remove padding from call buttons to fix undesired cropping.
2015-01-20am df4ae400: am 25a7b6eb: Merge "Remove padding from call buttons to fix ↵Nancy Chen
undesired cropping." into lmp-mr1-dev * commit 'df4ae40080b0668ae4e3e26204e8a2c3144fe3b4': Remove padding from call buttons to fix undesired cropping.
2015-01-20Merge "Remove padding from call buttons to fix undesired cropping." into ↵Nancy Chen
lmp-mr1-dev
2015-01-20Merge "Ensure sim color is shown on multi-sim devices when only one sim ↵Tyler Gunn
installed."
2015-01-19Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I5dfd386d62bc135cfc6e21dc491f32e43a92865b Auto-generated-cl: translation import
2015-01-19Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I489439c981d6dca20352208406491bcfdfd89354 Auto-generated-cl: translation import
2015-01-16Remove padding from call buttons to fix undesired cropping.Nancy Chen
Padding was added to the sides of the call button row in order to prevent false touches. However, this additional padding causes cropping of the background on the two buttons on the far left and far right when all 5 buttons are present on low resolution devices. Since on high resolution devices there is more than enough extra space on the left and right, this padding is being removed to eliminate cropping. Bug: 18122087 Change-Id: Ie948d9cbe4ef7025702ae1f4666354ab1be76bbc
2015-01-15am 7a92c047: am e1849fd9: am f06f97fa: Improve call button accessibility.Andrew Lee
* commit '7a92c047ff3365b06426e6df3c15daeb00a60737': Improve call button accessibility.
2015-01-15am e1849fd9: am f06f97fa: Improve call button accessibility.Andrew Lee
* commit 'e1849fd9ddedb98fd0b2d5b8017ca3fa2a7769bc': Improve call button accessibility.
2015-01-13Improve call button accessibility.Andrew Lee
+ Convert Audio Button into a ToggleButton, and update its content description depending on whether its acting as a toggle for speakerphone, or if it's acting as a menu button to select from more than two audio output modes. + Set custom style on ToggleButtons with null background, to override the default ToggleButton styling which was causing shadows. - Delete CallToggleButton, which did some hacky things with the content description and accessibility. - Delete helper method which abused TYPE_ANNOUNCEMENTS. Rely on default TalkBack behavior for ToggleButtons to read on click. - Delete unused accessibility strings. The states these were formerly read out for will now be handled by a combination of button labels and default TalkBack behavior. The UI (without TalkBack) behaves the same after these changes. The behavior with TalkBack after these changes is that the audio (when toggling for speakerphone), mute, and hold buttons will generally read "speaker/mute/hold button (not) checked" when explored by touch depending on their state. They will read "speaker/mute/hold" when clicked. If more than two audio modes are supported, the audio button will read "<mode> button checked", where <mode> can be speaker, bluetooth, handset, or earpiece. When clicked, it will open the audio pop up menu and read that there are # options displayed on the screen. This is combines the ToggleButton and PopupMenu Talkback behavior, since this is a custom widget. Bug: 18783204 Change-Id: I27363c697bb018b5f87ad2e27678f8db6d93b2e7
2015-01-13Ensure sim color is shown on multi-sim devices when only one sim installed.Tyler Gunn
- Removed telecomManager check hasMultipleCallCapableAccounts() which would only return 1 when a single sim is installed in a multisim phone. - For single-sim devices, the Sim color is 0 (ie not selected) for the Sim PhoneAccount, so the default behavior is to not show a sim color. Bug: 18696518 Change-Id: I3968e181a41244092d2058fcf3dc8d627d12b412
2015-01-10am 2128fb9e: am 4ba60da1: am 8e1c0a98: Merge "Tidy up text alignments for ↵Andrew Lee
secondary call info." into lmp-mr1-dev * commit '2128fb9e9350517ddbd01c091faa1ba678663455': Tidy up text alignments for secondary call info.
2015-01-10am 068b226e: am 5295eadc: am 3a8eaf2d: [DS] Fix a bug about Sip incoming ↵Mick Lin
call screen do not show. * commit '068b226e6ab1b92427d274d1f85e42663c37b4a3': [DS] Fix a bug about Sip incoming call screen do not show.
2015-01-10am 4ba60da1: am 8e1c0a98: Merge "Tidy up text alignments for secondary call ↵Andrew Lee
info." into lmp-mr1-dev * commit '4ba60da11d069360170575b615ae914e2065a78a': Tidy up text alignments for secondary call info.
2015-01-10am 5295eadc: am 3a8eaf2d: [DS] Fix a bug about Sip incoming call screen do ↵Mick Lin
not show. * commit '5295eadcbe7bf6a7cda137d4186bbc134dc6d4a0': [DS] Fix a bug about Sip incoming call screen do not show.
2015-01-09Merge "Tidy up text alignments for secondary call info." into lmp-mr1-devAndrew Lee
2015-01-09Tidy up text alignments for secondary call info.Andrew Lee
This fixes bad alignment in RTL languages. Bug: 18009146 Change-Id: I8691b5e017363158c6933f4b4e55c2c16ca3a2ac
2015-01-09[DS] Fix a bug about Sip incoming call screen do not show.Mick Lin
For buganizer #18847828 Dismiss the conference management screen when call incoming. Change-Id: I470d059ae69a5a54b54de6be12b4fe335c23b8f1
2015-01-09am 2214a6e8: am 00dec2c8: am 25c3e808: Merge "Fixing Null Pointer exception ↵Tyler Gunn
due to uninitialized view reference." into lmp-mr1-dev * commit '2214a6e86e9ab6f368edd5b7b910bdb5040a8019': Fixing Null Pointer exception due to uninitialized view reference.
2015-01-09am 00dec2c8: am 25c3e808: Merge "Fixing Null Pointer exception due to ↵Tyler Gunn
uninitialized view reference." into lmp-mr1-dev * commit '00dec2c8c8a052b6ad9d358e884a5008b5b27d7f': Fixing Null Pointer exception due to uninitialized view reference.
2015-01-08Merge "Fixing Null Pointer exception due to uninitialized view reference." ↵Tyler Gunn
into lmp-mr1-dev
2015-01-08am 9268114e: am 5718958a: am 2759ccba: Read enabled/disabled state for ↵Andrew Lee
InCall buttons. * commit '9268114ef4367d6ccc12fca7ef0feaaa64d19311': Read enabled/disabled state for InCall buttons.
2015-01-08am 5718958a: am 2759ccba: Read enabled/disabled state for InCall buttons.Andrew Lee
* commit '5718958af69dbe022c452a6b6b94a391d92a8900': Read enabled/disabled state for InCall buttons.
2015-01-08Fixing Null Pointer exception due to uninitialized view reference.Tyler Gunn
Bug indicates a crash occurred when trying to separate a call from a conference call. The exception thrown was due to calling "setText" on mSecondaryCallProviderLabel when it was null. Although I was not able to reproduce this situation, it appears it would be possible for showAndInitializeSecondaryCallInfo to not set the mSecondaryCallProviderLabel reference when then mSecondaryCallName is initially set if the hasProvider flag is false at the time. If hasProvider becomes true in the future since mSecondaryCallName is already initialized, the code to initialize mSecondaryCallProviderLabel would not run, causing the NPE. I have restructured the code to ensure that this type of scenario is handled appropriately. Bug: 18917883 Change-Id: I837d96aad7ed98729490d95beb897b08e1b08365