summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2014-05-2055-540/+216
* TouchFeedbackDrawable is now RippleDrawableAlan Viverette2014-05-193-6/+6
* Center dialpad button in call button fragment.Andrew Lee2014-05-191-7/+7
* Reposition SIP call labelYorke Lee2014-05-182-16/+15
* Further improvements to InCall transition animationYorke Lee2014-05-163-90/+86
* Merge "Simplify and optimize InCall animation"Yorke Lee2014-05-161-114/+89
|\
| * Simplify and optimize InCall animationYorke Lee2014-05-161-114/+89
* | Fix InCallUI crashYorke Lee2014-05-166-0/+0
|/
* Merge remote-tracking branch 'goog/master-nova' into mergeEvan Charlton2014-05-1564-3/+677
|\
| * resolved conflicts for merge of 41ffd656 to master-novaAndrew Lee2014-05-097-133/+18
| |\
| * \ am 84ac44b7: Update icons and dimensions for the InCallUI.Andrew Lee2014-05-1029-50/+28
| |\ \
| * \ \ resolved conflicts for merge of d5557cb1 to master-novaAndrew Lee2014-05-099-1/+1
| |\ \ \
| * \ \ \ am 3e4bac34: Merge "Change toolbar icons in the InCallUI."Andrew Lee2014-05-0955-17/+23
| |\ \ \ \
| * \ \ \ \ am 0ff634f2: Change button press to use yellow accent color.Andrew Lee2014-05-094-4/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge "Re-add network indicator/handoff button" into master-novaEvan Charlton2014-05-098-9/+145
| |\ \ \ \ \ \
| | * | | | | | Re-add network indicator/handoff buttonEvan Charlton2014-05-098-9/+145
| * | | | | | | am a6b8624c: Merge "Move glowpad to call card fragment."Andrew Lee2014-05-094-13/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 99782844: Touch up InCallUI call card positioning.Andrew Lee2014-05-094-92/+94
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am dd79f815: Animate InCallUI dialpad.Andrew Lee2014-05-082-8/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am edb47330: Style tweaks for InCall dialpad.Andrew Lee2014-05-082-7/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 46c8fb8e: Merge "Change selected/unselected states of buttons."Andrew Lee2014-05-077-23/+137
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of d4a1d2e5 to master-novaEvan Charlton2014-05-0710-344/+33
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am aa30b74b: Tweak InCallUI colors.Andrew Lee2014-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 0d3eff64: Fix wrong class reference in XMLYorke Lee2014-05-061-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am de956513: Styling polish to InCallUI.Andrew Lee2014-05-027-25/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am be27e631: Add fancier press states for buttons.Andrew Lee2014-05-0210-11/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 49f62038: Merge "Consolidate buttons to use more common drawables."Andrew Lee2014-05-0120-90/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix the buildEvan Charlton2014-05-011-0/+5
| * | | | | | | | | | | | | | | | | resolved conflicts for merge of d733dba7 to master-novaAndrew Lee2014-05-011-21/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 146a8de0: Use ShapeDrawable for floating end call button in InCallUIYorke Lee2014-04-255-1/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 0303e23a to master-novaEvan Charlton2014-04-255-53/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 121e8dc0 to master-novaEvan Charlton2014-04-255-29/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4c3e9e8e: Properly enable/disable end call button.Andrew Lee2014-04-242-68/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 7b4cfe59 to master-novaAndrew Lee2014-04-234-75/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of faa97b36 to master-novaYorke Lee2014-04-236-72/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 90915722: Removed unused stringsJay Shrauner2014-04-231-25/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix layout issues with Wi-Fi in-call status.Ihab Awad2014-04-091-41/+51
| * | | | | | | | | | | | | | | | | | | | | | | | | InCallUI: Handoff UI tweaksSailesh Nepal2014-04-072-6/+26
* | | | | | | | | | | | | | | | | | | | | | | | | | First pass at Dialer to InCall transitionYorke Lee2014-05-154-81/+108
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make the dialpad fully opaque."Andrew Lee2014-05-141-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Make the dialpad fully opaque.Andrew Lee2014-05-141-2/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 8abea101 to masterEvan Charlton2014-05-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Handoff: Hookup handoff button to InCallUISailesh Nepal2014-04-032-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 56ad9dd9: Fix for in-call dialpad not sliding full length of screenYorke Lee2014-03-242-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2902e079: Merge "Fix build breakage: Fix an ID syntax error."Ihab Awad2014-03-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 74067fbe: Merge "Rearrange dialpad layout for better esthetics."Ihab Awad2014-03-216-47/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 13381079 to masterEvan Charlton2014-05-142-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of a389ad35 to master-novaEvan Charlton2014-03-0710-111/+339
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '5bcdca79' into manual_mergeSailesh Nepal2014-02-181-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 500e399c to masterEvan Charlton2014-05-147-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 08:30:38 +0000