summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2014-05-2055-540/+216
| | | | | Change-Id: I4307410a2f6c34f6c1c6a445a37fb59599771fb2 Auto-generated-cl: translation import
* TouchFeedbackDrawable is now RippleDrawableAlan Viverette2014-05-193-6/+6
| | | | Change-Id: I6d92fe9a58ee30e42639b5f427678170997ac039
* Center dialpad button in call button fragment.Andrew Lee2014-05-191-7/+7
| | | | Change-Id: I0adac04cf5ab22de5392796692f45b0684b1aeff
* Reposition SIP call labelYorke Lee2014-05-182-16/+15
| | | | | Bug: 14981389 Change-Id: I63b39643cee84634581b9122752d16b472f7d7e9
* Further improvements to InCall transition animationYorke Lee2014-05-163-90/+86
| | | | | | | | | | * Remove unneeded parent layouts in call_card.xml * Individual child views in the call card container now translate upwards Bug: 14820894 Change-Id: I04411b76f99b4d519d4ef30400f134e8b9191aa6
* Merge "Simplify and optimize InCall animation"Yorke Lee2014-05-161-114/+89
|\
| * Simplify and optimize InCall animationYorke Lee2014-05-161-114/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the scrim and directly animate the call card container * ResizeAnimation is no longer needed, instead we animate the height of the card by using an ObjectAnimator and prevent any layout changes from happening during the duration of that animation * Change together Animators to remove some boilerplate * Remove now redundant outer FrameLayout in call_card.xml Bug: 14820894 Change-Id: Ifc847a47e6e03deed902c81740272a08e09a318b
* | Fix InCallUI crashYorke Lee2014-05-166-0/+0
|/ | | | | | | | | Workaround for missing drawables for densities lower than xxhdpi. The drawables will appear to be scaled wrong but this fixes the crash in InCallActivity. Bug: 15005741 Change-Id: I0dfb6f0ea50caa393dd85a3ef7ec7dd959179af5
* Merge remote-tracking branch 'goog/master-nova' into mergeEvan Charlton2014-05-1564-3/+677
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: res/layout/call_card.xml res/values-da/strings.xml res/values-hi/strings.xml src/com/android/incallui/CallButtonPresenter.java src/com/android/incallui/CallCardFragment.java src/com/android/incallui/CallCardPresenter.java src/com/android/incallui/DialpadFragment.java Change-Id: I6b3a2b063a2efd76330d4833cd95be3132f01462
| * resolved conflicts for merge of 41ffd656 to master-novaAndrew Lee2014-05-097-133/+18
| |\ | | | | | | | | | Change-Id: Ie8f34527c54b99e4e6530ff9ccf2bfb24f222487
| * \ am 84ac44b7: Update icons and dimensions for the InCallUI.Andrew Lee2014-05-1029-50/+28
| |\ \ | | | | | | | | | | | | | | | | * commit '84ac44b71d8336709658ac65ce9acfa85df7dbf0': Update icons and dimensions for the InCallUI.
| * \ \ resolved conflicts for merge of d5557cb1 to master-novaAndrew Lee2014-05-099-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I6c9d594781d9d8de830104b1e038d381aacbc969
| * \ \ \ am 3e4bac34: Merge "Change toolbar icons in the InCallUI."Andrew Lee2014-05-0955-17/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e4bac342714075a9ca776b1d8357a763b06dcfc': Change toolbar icons in the InCallUI.
| * \ \ \ \ am 0ff634f2: Change button press to use yellow accent color.Andrew Lee2014-05-094-4/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ff634f21390b1cf1376a3a0ae1da6a21fe59146': Change button press to use yellow accent color.
| * \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a handoff button (and network indicator) back into InCallUI. This has not be vetted by UX or anything, but it will hopefully not cause merge conflicts. Change-Id: I6d0a8e7cd865df70b13fc69ec96cdc98e0e3f203
| * | | | | | | am a6b8624c: Merge "Move glowpad to call card fragment."Andrew Lee2014-05-094-13/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6b8624c4986bc48cdfb527f950e1e080133f51d': Move glowpad to call card fragment.
| * \ \ \ \ \ \ \ am 99782844: Touch up InCallUI call card positioning.Andrew Lee2014-05-094-92/+94
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '99782844e859fe1390f718e64d525156c532747b': Touch up InCallUI call card positioning.
| * | | | | | | | am dd79f815: Animate InCallUI dialpad.Andrew Lee2014-05-082-8/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd79f815edd15d5ccea31c10ee5dd8f3b5873d05': Animate InCallUI dialpad.
| * \ \ \ \ \ \ \ \ am edb47330: Style tweaks for InCall dialpad.Andrew Lee2014-05-082-7/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'edb47330ff350841051ac432a10eed5220fe2a89': Style tweaks for InCall dialpad.
| * \ \ \ \ \ \ \ \ \ am 46c8fb8e: Merge "Change selected/unselected states of buttons."Andrew Lee2014-05-077-23/+137
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46c8fb8e67ae14cd95f5e614d27468a94e37c88f': Change selected/unselected states of buttons.
| * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of d4a1d2e5 to master-novaEvan Charlton2014-05-0710-344/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b78644dfee1ee9d6cc8627bd480858361cfae43
| * \ \ \ \ \ \ \ \ \ \ \ am aa30b74b: Tweak InCallUI colors.Andrew Lee2014-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa30b74b036ef0e5c72fb1ab247aeaac058b2efb': Tweak InCallUI colors.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 0d3eff64: Fix wrong class reference in XMLYorke Lee2014-05-061-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d3eff64eba88239be35cda4e0cbf2bf596c1f2d': Fix wrong class reference in XML
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am de956513: Styling polish to InCallUI.Andrew Lee2014-05-027-25/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de956513f9db9ff52a8c2d85f3bdddeb4cfcf845': Styling polish to InCallUI.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am be27e631: Add fancier press states for buttons.Andrew Lee2014-05-0210-11/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be27e631762da84e2f1b085e7c700b59a882c62d': Add fancier press states for buttons.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 49f62038: Merge "Consolidate buttons to use more common drawables."Andrew Lee2014-05-0120-90/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49f62038919e3ea541a5e63196ca5232ea6d5590': Consolidate buttons to use more common drawables.
| * | | | | | | | | | | | | | | | | Fix the buildEvan Charlton2014-05-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somewhere along the line, we dropped a resource (and a variable name was changed). Fix these errors. Change-Id: I06ce956961e8bf0e08f03d51651bf48262055703
| * | | | | | | | | | | | | | | | | resolved conflicts for merge of d733dba7 to master-novaAndrew Lee2014-05-011-21/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b90095c8eac169f059f40402b44e192d408a817
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 146a8de0: Use ShapeDrawable for floating end call button in InCallUIYorke Lee2014-04-255-1/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '146a8de0077ad75b2ff2daddd187f40859c36ec0': Use ShapeDrawable for floating end call button in InCallUI
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 0303e23a to master-novaEvan Charlton2014-04-255-53/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9d82881b950101db7b43a978a6038132a7a6a8f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 121e8dc0 to master-novaEvan Charlton2014-04-255-29/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8cfd2d26ddd4ea96e76758e4e3485a10fcaedd50
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4c3e9e8e: Properly enable/disable end call button.Andrew Lee2014-04-242-68/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c3e9e8e45ecafcb9aaf0da9901a5e9cebc59bc4': Properly enable/disable end call button.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 7b4cfe59 to master-novaAndrew Lee2014-04-234-75/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42b453f23db08952cdbcb17b1bdb199d504e92ef
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of faa97b36 to master-novaYorke Lee2014-04-236-72/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief63a53f6873b25b4be810acb1c7ee4ffbe4b80f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 90915722: Removed unused stringsJay Shrauner2014-04-231-25/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90915722dd200859cf6afb60c28442f753f51704': Removed unused strings
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix layout issues with Wi-Fi in-call status.Ihab Awad2014-04-091-41/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13890032 Change-Id: I6d34993acd2f608d808a786025ec9b07aff6dc09
| * | | | | | | | | | | | | | | | | | | | | | | | | InCallUI: Handoff UI tweaksSailesh Nepal2014-04-072-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL disables the handoff button when handoff is pending. It also cleans up the handoff UI code. Bug: 13565185, 13799169 Change-Id: Ie2831ba29d628fb5a0538defe918e3151eb5b824
* | | | | | | | | | | | | | | | | | | | | | | | | | First pass at Dialer to InCall transitionYorke Lee2014-05-154-81/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Modify InCallActivity to perform an animation only on a new outgoing call * Add an animated scrim to call_card.xml that serves as the backdrop of the full screen animated reveal * Add resize animation * Add circular reveal animation Bug: 14820894 Change-Id: Iaa7e87e8a96dcd269e444a40eadac9d912625c01
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make the dialpad fully opaque."Andrew Lee2014-05-141-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Make the dialpad fully opaque.Andrew Lee2014-05-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I332ad12f96c0615e164db1f25b55527b7b77a15c
* | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 8abea101 to masterEvan Charlton2014-05-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id21435a4d92864c8395846a82a7d8d1643d0125a
| * | | | | | | | | | | | | | | | | | | | | | | | | | Handoff: Hookup handoff button to InCallUISailesh Nepal2014-04-032-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13643568 Change-Id: I94c28b10c0e0a253450f14d31ecdc416d5b44ca4
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 56ad9dd9: Fix for in-call dialpad not sliding full length of screenYorke Lee2014-03-242-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '56ad9dd93608510d13159596b22a5454001d0ec1': Fix for in-call dialpad not sliding full length of screen
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2902e079: Merge "Fix build breakage: Fix an ID syntax error."Ihab Awad2014-03-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2902e079329c5f45522481384839d08bc1d0f898': Fix build breakage: Fix an ID syntax error.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 74067fbe: Merge "Rearrange dialpad layout for better esthetics."Ihab Awad2014-03-216-47/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74067fbeb03b873ac822a2942ad3ae66440b0e4f': Rearrange dialpad layout for better esthetics.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 13381079 to masterEvan Charlton2014-05-142-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba11dc459f0d0e288b1749d2ea912dbd928e140d
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of a389ad35 to master-novaEvan Charlton2014-03-0710-111/+339
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I165b2592b7c6edc29e1ba49ddf293d9c3dfaa726
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '5bcdca79' into manual_mergeSailesh Nepal2014-02-181-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 500e399c to masterEvan Charlton2014-05-147-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7cc16e713bb142450c7689942097110bde404b54
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 07:02:40 +0000