summaryrefslogtreecommitdiff
path: root/InCallUI/src
AgeCommit message (Collapse)Author
2015-03-02Merge "Update some comments in InCallActivity"Yorke Lee
2015-02-27Update some comments in InCallActivityYorke Lee
Change-Id: I9fce3fbd1fa51a6a0489de2d97691fc8e4aa143c
2015-02-26Merge "InCall code cleanup"Yorke Lee
2015-02-25Merge "Remove use of ttsSpanAsPhoneNumber"Yorke Lee
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-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-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-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-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 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 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
2015-01-07Read enabled/disabled state for InCall buttons.Andrew Lee
+ Add CallToggleButton which ignores the content description so that we can substitue our own strings to be read by Talkback when the user clicks on buttons. + Convert ImageButtons with two states into ToggleButtons, so that when focused Talkback automatically reads out their states. For example, now it will read "Mute switch is (not) checked". This required updating some casts and references in the fragment. + Set baselineAligned property for call buttons to false. Because ToggleButtons could have text, it was attempting to align by text baselines which messed with the layout. - Remove a compound button listener which is not used. Bug: 18783204 Change-Id: I0b23f5f63a2bf7c34a34077a75a23ea92dc45bbc
2015-01-07am 2aea3bcb: am 7dca62f4: Merge "Announce incoming calls in all cases" into ↵Ihab Awad
lmp-mr1-dev * commit '2aea3bcb5abe353c3092715b4b0e21ea0fe1f460': Announce incoming calls in all cases
2015-01-07Merge "Announce incoming calls in all cases" into lmp-mr1-devIhab Awad
2015-01-05Ensure 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
2014-12-30am 6bbe730c: am 179f49b0: Merge "Call duration should be verbalized as ↵Nancy Chen
hours, minutes, seconds." into lmp-mr1-dev * commit '6bbe730cc304342fb2cd7baa91ef4ff3be3cbf27': Call duration should be verbalized as hours, minutes, seconds.
2014-12-30Merge "Call duration should be verbalized as hours, minutes, seconds." into ↵Nancy Chen
lmp-mr1-dev
2014-12-26am 37845319: am ad9aeb99: Merge "Minor UI tweak" into lmp-mr1-devYorke Lee
* commit '378453190f85c0ecb0d643a75e781df32ddaa3b2': Minor UI tweak
2014-12-26am 49a1e2ea: am 8c4fed1e: Merge "Add haptic vibration feedback on in-call ↵Santos Cordon
buttons." into lmp-mr1-dev * commit '49a1e2eaf6d0df75d011f9922d01d9ffd4fbe971': Add haptic vibration feedback on in-call buttons.
2014-12-23Call duration should be verbalized as hours, minutes, seconds.Nancy Chen
Currently the call duration in the InCallUI is read as a time. It should be read in terms of hours, minutes, seconds. Updated contentDescription to match this specification. Bug: 18761699 Change-Id: I5b6eded63471c905638e05a5b5336403568f77e9
2014-12-23Merge "Minor UI tweak" into lmp-mr1-devYorke Lee
2014-12-22Announce incoming calls in all casesIhab Awad
Bug: 18797453 Change-Id: I81d75a145db9303cd77cb0bc14abaed788f0c5b8
2014-12-22Merge "Add haptic vibration feedback on in-call buttons." into lmp-mr1-devSantos Cordon
2014-12-22Minor UI tweakYorke Lee
Change-Id: I37c1132d06264c3e8cdbbf181fe274cd26a99c80
2014-12-19am 8c79b1fb: am 3448dd02: Merge "Show error dialog and end call for service ↵Yorke Lee
not supported error" into lmp-mr1-dev * commit '8c79b1fb8472a3143bf1b0bdf3a4e86f77709a6f': Show error dialog and end call for service not supported error
2014-12-19Merge "Show error dialog and end call for service not supported error" into ↵Yorke Lee
lmp-mr1-dev
2014-12-18Add haptic vibration feedback on in-call buttons.Santos Cordon
For buttons which appear an first-class actions in the in-call screen, add haptic feedback. This feedback ignores the system settings, meaning that it vibrates when buttons are touched regardless of the system settings for vibrating on keypress. Bug: 18388068 Change-Id: Ifadc973af9bcdfdfdc9d51b1c927b08d93714a58
2014-12-18Show error dialog and end call for service not supported errorYorke Lee
Add another condition for which InCallActivity is launched so that it can disconnect the call and show the error dialog. Slight refactor of code that checks if a call has valid accounts so that it can be shared. Bug: 18781230 Change-Id: I83a9c4ee30f2a80168f3244f4929f70aa46b9d83
2014-12-17am 60e61f90: am 85e0b443: Always animate drawables when given animationsEvan Charlton
* commit '60e61f9086688fd328eeb1bd7baad99cf462f1e0': Always animate drawables when given animations
2014-12-17Always animate drawables when given animationsEvan Charlton
When given an animated drawable, always animate it, rather than only when the call isn't connected. Bug: 18695179 Change-Id: Ia9b320e2f5f47ee7fdfb489b91c736912dcdfd16
2014-12-17am e3733c84: am c10b11df: Merge "Add phone number annotations for TalkBack" ↵Ihab Awad
into lmp-mr1-dev * commit 'e3733c849bf2944e2ebb1b571a19378eefb21fcc': Add phone number annotations for TalkBack
2014-12-17am 910073d7: am 5996246f: Merge "Revert "Allow back to be pressed while in ↵Yorke Lee
incoming call screen"" into lmp-mr1-dev * commit '910073d71fabb2dd24b43d67068f076f1b42a81b': Revert "Allow back to be pressed while in incoming call screen"
2014-12-17Merge "Add phone number annotations for TalkBack" into lmp-mr1-devIhab Awad
2014-12-17Merge "Revert "Allow back to be pressed while in incoming call screen"" into ↵Yorke Lee
lmp-mr1-dev
2014-12-16Add phone number annotations for TalkBackIhab Awad
Bug: 18759212 Change-Id: I2850941e0f007320aa06c34f5c8e550e672e15dd
2014-12-16am 6184f072: am 4383e5db: Merge "Use mInCallActivity if mContext is null." ↵Andrew Lee
into lmp-mr1-dev * commit '6184f072723bb3ba38ad07b4167dba3cc02ba74e': Use mInCallActivity if mContext is null.
2014-12-16Merge "Use mInCallActivity if mContext is null." into lmp-mr1-devAndrew Lee
2014-12-16am 616f0eac: am 2396cf49: Animate drawables if possibleEvan Charlton
* commit '616f0eaceb1996c9e61ab6842d3f4118a887366a': Animate drawables if possible
2014-12-15Revert "Allow back to be pressed while in incoming call screen"Yorke Lee
This reverts commit bd9ccd501ebd83508dfe52121e0f4827cc6e1fa3. Bug: 18742942 Change-Id: I8016ddae8addb56b4d6350748628fec351e6531a
2014-12-15Animate drawables if possibleEvan Charlton
If the ConnectionService provides an animated drawable for the call state icon, animate it. Bug: 18745128 Change-Id: I2e688549e7f34445db49726c4eb986d5dd60efdc
2014-12-15Use mInCallActivity if mContext is null.Andrew Lee
It seems that attemptFinishActivity can occasionally be invoked when mContext hasn't been set, via setActivity -> updateActivity -> attemptFinishActivity, if there are NO_CALLS. In this case, fall back on mInCallActivity as the context for clearing the display. Bug: 18728214 Change-Id: I504af612f79e14787741b14b03170805f57c5699
2014-12-12am b40745a5: am 1edf3821: Merge "Support RTL in InCall call card." into ↵Andrew Lee
lmp-mr1-dev * commit 'b40745a542998bd6e729c41c2dd056ba22317427': Support RTL in InCall call card.
2014-12-12Merge "Support RTL in InCall call card." into lmp-mr1-devAndrew Lee
2014-12-12Support RTL in InCall call card.Andrew Lee
+ Specify "START" text alignment for call state label and the name. + Specify "END" text alignment for the elapsed time. + Make the elapsed time view expand to take the parent's width, instead of the number and location label's parent view. + Switch elapsed time text alignment to START if the number and label view is hidden. Bug: 18716511 Change-Id: I6d2ef5fe8a4364d42fb0438541e00ecce3daeaab
2014-12-11am ec54cd8c: am 6bd19a57: Merge "No InCall UI visible after hiding ↵Tyler Gunn
conference manager." into lmp-mr1-dev * commit 'ec54cd8c9bcd4a84b6df323cd4f074b6317d78ae': No InCall UI visible after hiding conference manager.
2014-12-11am defa9141: am 5d57be4e: Merge "Show error dialogs in InCallUI" into ↵Yorke Lee
lmp-mr1-dev * commit 'defa914113c574dedce826cc782971714c981bb0': Show error dialogs in InCallUI
2014-12-10Merge "No InCall UI visible after hiding conference manager." into lmp-mr1-devTyler Gunn
2014-12-10No InCall UI visible after hiding conference manager.Tyler Gunn
- The hide of the conference manager fragment and subsequent show of the call card was being done inconsistently in a few places. - Added a new method to hide/show the conference manager fragment and the call card at the same time and replaced all references with this new unified method. Bug: 18699503 Change-Id: Ia6b80bdc29198627b1c46de72da432dc9523dc5e
2014-12-10Show error dialogs in InCallUIYorke Lee
* Show InCallActivity for state IN_CALL as well to ensure that error dialogs are shown * Override pending transitions in CircularRevealActivity to avoid animation jank when starting new call from launcher * Don't override disconnect cause in onCallRemoved * Track service unbinding and binding in InCallPresenter. An unbound service means InCallActivity will not be shown. Bug: 18675781 Change-Id: I6a34091dba13c730e5b69bfef50c2dda8224803a
2014-12-08am e83ec37d: am 9cb3912d: Add some logging to outgoing call flowYorke Lee
* commit 'e83ec37d19beaf18d04199831e308126a28fc1b4': Add some logging to outgoing call flow
2014-12-08am b34c0296: am d061f68d: Merge "Improve outgoing call UI responsiveness" ↵Yorke Lee
into lmp-mr1-dev * commit 'b34c02966664758371de8f71b902ceaefca95e2e': Improve outgoing call UI responsiveness
2014-12-08am 3a4c53fe: am e405a9c6: Merge "Fixing manage conference accessibility ↵Tyler Gunn
issues." into lmp-mr1-dev * commit '3a4c53fe34ed846c12b724ff69a896d6d900fdb3': Fixing manage conference accessibility issues.
2014-12-04Add some logging to outgoing call flowYorke Lee
Bug: 18373617 Change-Id: If742fb29397c0d617721a54eaa05c098eeaf4280
2014-12-05Merge "Improve outgoing call UI responsiveness" into lmp-mr1-devYorke Lee
2014-12-04Merge "Fixing manage conference accessibility issues." into lmp-mr1-devTyler Gunn
2014-12-04Improve outgoing call UI responsivenessYorke Lee
* Start InCallUI immediately once Telecom binds * This CL is a bandaid for improving outgoing call responsiveness in the MR1 timeframe. Refactoring InCallActivity into dynamically added fragments and modifying its lifecycle with respect to the call list is too risky. * Add a lightweight activity (CircularRevealAnimationActivity) that is used to display the circular reveal animation while the significantly heavier InCallActivity is starting up * Inside InCallServiceImpl.bind, start the reveal animation once bind is called to avoid being blocked by any synchronous work in Telecom. * Refactor CallCardFragment.animateForNewOutgoingCall to conditionally display the reveal animation, depending on whether or not it was already displayed by the CircularRevealAnimationActivity. * Refactor the calculation of theme colors in InCallPresenter so that the CircularRevealAnimationActivity can use those colors as well. * Remove PENDING_OUTGOING from the list of call states that bring up InCallUI. Bug: 18373617 Bug: 18611753 Change-Id: I44c593373864ffc0ba9edebb88887177112d8b27
2014-12-04am f53757b9: am c13806df: Bidi wrap phone number in incoming notification.Andrew Lee
* commit 'f53757b9de15ed67f02aefd9dfd4edd289b8a997': Bidi wrap phone number in incoming notification.
2014-12-04Fixing manage conference accessibility issues.Tyler Gunn
1. The "Manage Conference" button would be announced twice when it received focus. Moved content description to the parent FrameLayout that acts as the button and made it focusable to ensure that the description is read only a single time. 2. When tapping "Manage Conference" button there was no audible feedback that the manage conference screen was opened. Set focus to the list of conference participants so that this list is announced when the manage conference screen opens. 3. It was possible to change focus from the list of participants in the manage conference screen to the call card buttons and other elements behind the manage conference screen. Fixed by explicitly setting the call card fragment visibility to GONE when the conference manager is shown. Bug: 18440532 Change-Id: I0ce4f74ccb98c5cefd6c6e75eb8ef9310bd6d7fb
2014-12-03am e13db0a2: am 3d512ad6: Merge "Don\'t cancel incall notification ↵Yorke Lee
unnecessarily" into lmp-mr1-dev * commit 'e13db0a22f162d49b7df03aebc8f19dd099fb28d': Don't cancel incall notification unnecessarily
2014-12-03am f08401fa: am 4675da66: Merge "Show HD audio icon." into lmp-mr1-devAndrew Lee
* commit 'f08401fa00d3ab82403fc6e0fcbbb7b4261b00d1': Show HD audio icon.
2014-12-03am c4b19884: am 30c72ddd: Merge "Dialer: Set notification category for ↵John Spurlock
incoming calls." into lmp-mr1-dev * commit 'c4b19884743c88770d323304d6f94d448c16d948': Dialer: Set notification category for incoming calls.
2014-12-03Bidi wrap phone number in incoming notification.Andrew Lee
The phone number should always be displayed LTR, regardless of whether the language is LTR or RTL. Bug: 18581329 Change-Id: I7f8e43f86d996625da781500e61c65abe507304e
2014-12-03Merge "Don't cancel incall notification unnecessarily" into lmp-mr1-devYorke Lee
2014-12-03Merge "Show HD audio icon." into lmp-mr1-devAndrew Lee
2014-12-03Merge "Dialer: Set notification category for incoming calls." into lmp-mr1-devJohn Spurlock
2014-12-03Dialer: Set notification category for incoming calls.John Spurlock
Bug: 18468085 Change-Id: I5d64f8958fe2be1952ee8a98fef77c6dd7d5e46a
2014-12-03am 1e739f45: am bf4c6389: Merge "Add some more logging in InCallActivity and ↵Yorke Lee
InCallPresenter" into lmp-mr1-dev * commit '1e739f457d7283824ee0d2b72730a84e33b8dd67': Add some more logging in InCallActivity and InCallPresenter
2014-12-03Merge "Add some more logging in InCallActivity and InCallPresenter" into ↵Yorke Lee
lmp-mr1-dev
2014-12-02am fbb15fca: am fc4b5bf5: Merge "Change Log.wtf to Log.w to prevent rare ↵Nancy Chen
crash." into lmp-mr1-dev * commit 'fbb15fcad5e3d63419663705f1d5cb2c2ab6a97c': Change Log.wtf to Log.w to prevent rare crash.
2014-12-02Add some more logging in InCallActivity and InCallPresenterYorke Lee
Bug: 18589036 Change-Id: Idac704fab2f31ecc908c1fe9ffe854dda0d2c34f
2014-12-02Merge "Change Log.wtf to Log.w to prevent rare crash." into lmp-mr1-devNancy Chen
2014-12-02Show HD audio icon.Andrew Lee
Leveraging the same mechanism we use for indicating subscriptions. I don't think we have any cases where we need to show more than one icon for the moment; we can add functionality to show more if its necessary later. Bug: 18103173 Change-Id: I1134f6114e17d4492276dc4e19c4746fc38a3ab7
2014-12-02Change Log.wtf to Log.w to prevent rare crash.Nancy Chen
Occasionally the message "Secondary info clicked but no secondary call." will cause a crash because it is logging wtf. It's not quite clear why this happens but is not causing any behavioral problems. Also no defined repo steps, but it's low-risk to turn Log.wtf to Log.w which will just log a warning instead of crash. Bug: 18465594 Change-Id: Ied23e5b52162cf68089bd5248fbdbf9e05eefdf8
2014-12-02am 1a4b3027: am fcd44c7d: Merge "Stop ringer when selecting "respond via ↵Nancy Chen
text"." into lmp-mr1-dev * commit '1a4b3027b659ed2825a9e2d024dc8d82974e8c2c': Stop ringer when selecting "respond via text".
2014-12-02Merge "Stop ringer when selecting "respond via text"." into lmp-mr1-devNancy Chen
2014-12-01am 731aef53: am 8936f6d6: Fix build breakage due to http://ag/587241Ihab Awad
* commit '731aef536924224cb6496c0d557383be71289c93': Fix build breakage due to http://ag/587241
2014-12-01Fix build breakage due to http://ag/587241Ihab Awad
Change-Id: I62a93662730afb8f8a5f75417549c8bb7d50cc78
2014-12-01am 9fa101fc: am 5c3e3745: Merge "Check for generic conference for showing ↵Andrew Lee
notification." into lmp-mr1-dev * commit '9fa101fc2cbcfafead188e290f5f300e7cbcdb77': Check for generic conference for showing notification.
2014-12-01Merge "Check for generic conference for showing notification." into lmp-mr1-devAndrew Lee
2014-12-01am 67c411ae: am 737f5676: Telecom API updates (3/6)Ihab Awad
* commit '67c411ae395d4f5a4b0a3a66f9bff58234b57664': Telecom API updates (3/6)
2014-11-28Telecom API updates (3/6)Ihab Awad
Bug: 18292176 Change-Id: I5bcb1838a8423f15ebdf87c945ca91da460506f4
2014-11-26Stop ringer when selecting "respond via text".Nancy Chen
Ringer should stop while user is selecting response from "respond via text" dialog. Bug: 14656360 Change-Id: Ib73e6f10f1bda8363b65391a53e61dc5eb5d8d8d
2014-11-25am 34b4406d: am a44049e1: Fix NPE in getCallProviderLabelJay Shrauner
* commit '34b4406dccd2ddfcdb2846fc6d30f946bcded1ff': Fix NPE in getCallProviderLabel
2014-11-24Fix NPE in getCallProviderLabelJay Shrauner
Bug:18506544 Change-Id: I720e090bdda87904f61fa6fd0f1aa95844a4fe71
2014-11-23Don't cancel incall notification unnecessarilyYorke Lee
This code path happens ~8 times in the outgoing call process and causes unnecessary binder transactions Bug: 18373617 Change-Id: I179159df396fcbbae306c5599f59b24f3addc56f
2014-11-21Check for generic conference for showing notification.Andrew Lee
Don't use conference call string / icon if it's a generic conference; we aren't positive what the state of the call is. Bug: 18488721 Change-Id: Ib9041b25d33f5f0baada6defca6351beb5a929d2
2014-11-20am d0df3257: am 7bf9d3e6: Merge "Disable cross-fade in InCallUI" into ↵Yorke Lee
lmp-mr1-dev * commit 'd0df3257b78b13a4931fc613e005bd349c2fc480': Disable cross-fade in InCallUI
2014-11-20am 832c25fa: am e4f10f30: Use conference call label for IMS calls.Andrew Lee
* commit '832c25fa2f32d861d8d4ce030f785f8afd95dbce': Use conference call label for IMS calls.
2014-11-20Merge "Disable cross-fade in InCallUI" into lmp-mr1-devYorke Lee