summaryrefslogtreecommitdiff
path: root/InCallUI
AgeCommit message (Collapse)Author
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-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-20DO NOT MERGE Don't hide caller photo for video callYorke Lee
Bug: 19728020 Change-Id: I6e5259c63553de9e5060621bcc749d1039b67ea1
2015-03-19Finish activity before reveal if not setup.Andrew Lee
automerge: c5722b4 * commit 'c5722b4638a4807a3accbd85822eeb7c09973c44': Finish activity before reveal if not setup.
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-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-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-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-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-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-22Merge "Ensure sim color is shown on multi-sim devices when only one sim ↵Tyler Gunn
installed." into lmp-mr1-dev
2015-01-20Merge "Remove padding from call buttons to fix undesired cropping." into ↵Nancy Chen
lmp-mr1-dev
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-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-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-08Merge "Fixing Null Pointer exception due to uninitialized view reference." ↵Tyler Gunn
into lmp-mr1-dev
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-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-30Merge "Call duration should be verbalized as hours, minutes, seconds." into ↵Nancy Chen
lmp-mr1-dev
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-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-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-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-16Merge "Use mInCallActivity if mContext is null." into lmp-mr1-devAndrew Lee
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-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-10Merge "No InCall UI visible after hiding conference manager." into lmp-mr1-devTyler Gunn
2014-12-10Merge "Show error dialogs in InCallUI" into lmp-mr1-devYorke Lee
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-09Removing "windowNoTitle" style attribute for InCallScreen.Tyler Gunn
This was preventing the actionBar from being initialized and used by the Conference Manager. The actionbar would come back null in the InCallActivity. Bug: 18675877 Change-Id: I442fea79ee64fbadf26f957fd84c1492eefa8dbe
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-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-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 "Adding missing touch feedback ripples for swap and hold conference ↵Tyler Gunn
buttons." into lmp-mr1-dev
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-03Merge "Add some more logging in InCallActivity and InCallPresenter" into ↵Yorke Lee
lmp-mr1-dev
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-02Adding missing touch feedback ripples for swap and hold conference buttons.Tyler Gunn
Added new ripple drawable for the two buttons. Bug: 18592386 Change-Id: I3c4145c1a400e3880bbe11dfe5eae94d2e17de9e
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-02Merge "Stop ringer when selecting "respond via text"." into lmp-mr1-devNancy Chen
2014-12-01Fix build breakage due to http://ag/587241Ihab Awad
Change-Id: I62a93662730afb8f8a5f75417549c8bb7d50cc78
2014-12-01Merge "Check for generic conference for showing notification." into lmp-mr1-devAndrew Lee
2014-12-01Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal
2014-12-01Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ibf5f0ed2b04ebb8743fdfab923ca3de6a3133f1c Auto-generated-cl: translation import
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-26Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Iab5ea1801e730ffac6ccd5787eedcf3af59b31cd Auto-generated-cl: translation import
2014-11-24Fix NPE in getCallProviderLabelJay Shrauner
Bug:18506544 Change-Id: I720e090bdda87904f61fa6fd0f1aa95844a4fe71
2014-11-24Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I416bba96f3579d2cf0600988905c680f66e23776 Auto-generated-cl: translation import
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-21Merge "Resize InCallUI for small devices." into lmp-mr1-devNancy Chen
2014-11-20Resize InCallUI for small devices.Nancy Chen
In the InCallUI for devices smaller than nexus 4, the dialpad digits are squished because the text in the call card is too big. Shrink the text selectively for smaller devices (by moving the current default sizes to the >600dp height devices). See http://developer.android.com/guide/topics/resources/providing-resources.html#BestMatch for reference. Bug:18122087 Change-Id: I3eceae520d5039dd18c39434eb548288d8ce4e61
2014-11-20Merge "Disable cross-fade in InCallUI" into lmp-mr1-devYorke Lee
2014-11-19Use conference call label for IMS calls.Andrew Lee
- Use GENERIC_CONFERENCE capability to show CDMA-scenario string and image asset. - Since mPrimary/mSecondary and others are class variables, don't pass them around all the time through functions if we don't need to. - Split out the isConference logic for setting the call cards into its own block. - Move logic for specifying conference string / icon into the CallCardPresenter. This makes more sense here, and means that we don't need to pass around a bunch of call paraemters to the fragment. Not all these changes are strictly necessary for the change I need to do, but I had made them originally because I had been thinking of using the VoLTE capability. Even though now I use GENERIC capability, I think the changes are still an improvement in terms of organization though. Bug: 18284408 Change-Id: I41d7825611456e9ea524db9dd2ef19c9646ab7e2
2014-11-19Disable cross-fade in InCallUIYorke Lee
Bug: 18373617 Change-Id: Ice934a4defbcb0a2c7c618230e00e352322ec95f
2014-11-19Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I8019412f81363a2e43ba1516e69cb3a37f1b01d4 Auto-generated-cl: translation import
2014-11-18Improve setting of contact photos in InCallUIYorke Lee
Add drawable caching in CallCardFragment so that we don't set the same drawable multiple times. Save and reuse the default contact photo and default conference photo to avoid possibly decoding them multiple times. Bug: 18373617 Change-Id: I54b925e6fc6f136f3d3ef27609fcdaf4c39a73dd
2014-11-17Merge "Removed unused VideoCallFragment" into lmp-mr1-devYorke Lee
2014-11-17Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I12ef7181f74056e42f6746d6db208ae1065b1345 Auto-generated-cl: translation import
2014-11-14Removed unused VideoCallFragmentYorke Lee
Bug: 18373617 Change-Id: Iae8cdd1f73de5f9824aff9d57fcf33b924527607
2014-11-12Add Null check for CanAddCall.Santos Cordon
Missing null check in recently added CanAddCall property. Bug: 18358924 Change-Id: Ia94e621b339fbd08ad074baa6eec787a90bb0fa4
2014-11-12Use the highlight color instead of the tint colorNancy Chen
The tint color of a phone account only refers to the color of the icon, the highlight color is the general display color used for text, backgrounds etc. We should use highlight color in InCallUI Also minor color updates (lightening the "dark" version a little) Bug: 18192071 Change-Id: I4078897bcb871326a4806f64355a67c5b267e9e6
2014-11-12Merge "Allow saving of presenter state during activity recreation" into ↵Yorke Lee
lmp-mr1-dev
2014-11-11Merge "Bring ripples back to InCallUI." into lmp-mr1-devNancy Chen
2014-11-11Merge "Don't let touches in ConferenceManagerFragment fall through" into ↵Yorke Lee
lmp-mr1-dev
2014-11-11Merge "Update PhoneAccount icon API (4/6)" into lmp-mr1-devIhab Awad
2014-11-11Merge "String resource edits for InCallUI" into lmp-mr1-devNancy Chen
2014-11-11Bring ripples back to InCallUI.Nancy Chen
With the color-change for MSIM, the ripples disappeared from the InCallUI buttons. This change adds them back. Bug: 18332863 Change-Id: Ic6125df06d0d2f3f2323fc2c422ccf075ff2df84