summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-05-22merge in master-release history after reset to 3e95ece3be7a052ad607a8b75e21a1...The Android Automerger
2014-05-22merge in master-release history after reset to 3e95ece3be7a052ad607a8b75e21a1...The Android Automerger
2014-05-22am 1ab8077b: (-s ours) am 0eb7fdec: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-05-22am 0eb7fdec: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-05-22Merge "Tweak InCallUI animation times"Yorke Lee
2014-05-21Tweak InCallUI animation timesYorke Lee
2014-05-21Import translations. DO NOT MERGEBaligh Uddin
2014-05-21Adjust dimensions of InCallUI styling.Andrew Lee
2014-05-21Merge "Import translations. DO NOT MERGE"Baligh Uddin
2014-05-21merge in master-release history after reset to 3c26b6cd3b6bf95cac3997ac95a229...The Android Automerger
2014-05-21Merge "Replace merge/swap icons in InCallUI."Andrew Lee
2014-05-20Replace merge/swap icons in InCallUI.Andrew Lee
2014-05-20Update call waiting UI.Andrew Lee
2014-05-20Import translations. DO NOT MERGEBaligh Uddin
2014-05-20merge in master-release history after reset to 19b7a0e2f2f5cffadf89bc9a01d001...The Android Automerger
2014-05-19TouchFeedbackDrawable is now RippleDrawableAlan Viverette
2014-05-19Center dialpad button in call button fragment.Andrew Lee
2014-05-19merge in master-release history after reset to 62c67fa648b7aa49f65bf645a01abc...The Android Automerger
2014-05-18Reposition SIP call labelYorke Lee
2014-05-18merge in master-release history after reset to bbbdbbb660f61d29f0636a6dd1f0a3...The Android Automerger
2014-05-17merge in master-release history after reset to bbbdbbb660f61d29f0636a6dd1f0a3...The Android Automerger
2014-05-16Further improvements to InCall transition animationYorke Lee
2014-05-16Merge "Simplify and optimize InCall animation"Yorke Lee
2014-05-16Fix InCallUI crashYorke Lee
2014-05-16Simplify and optimize InCall animationYorke Lee
2014-05-16Correctly set state to call card fragmentYorke Lee
2014-05-15Merge remote-tracking branch 'goog/master-nova' into mergeEvan Charlton
2014-05-15First pass at Dialer to InCall transitionYorke Lee
2014-05-15Fix end-call buttonEvan Charlton
2014-05-15Fix end-call buttonEvan Charlton
2014-05-15merge in master-release history after reset to 391bafb1527260cb67ca50327e7443...The Android Automerger
2014-05-14Fix the buildEvan Charlton
2014-05-14resolved conflicts for merge of 08235996 to masterEvan Charlton
2014-05-14am 358e4387: am 90915722: Removed unused stringsJay Shrauner
2014-05-14am 05f13a86: Merge "Accept calls in the NEW state" into master-novaEvan Charlton
2014-05-14am d9fa8d2e: (-s ours) Fix layout issues with Wi-Fi in-call status.Ihab Awad
2014-05-14Merge "Make the dialpad fully opaque."Andrew Lee
2014-05-14am 1771e5a1: (-s ours) InCallUI: Handoff UI tweaksSailesh Nepal
2014-05-14resolved conflicts for merge of a4819143 to masterEvan Charlton
2014-05-14am ead9566e: Fix DTMF in InCallUISailesh Nepal
2014-05-14am c7f8ba27: Remove setInCallServiceAdapter usageEvan Charlton
2014-05-14am c891f0e0: Temporarily disable handoff featureSailesh Nepal
2014-05-14resolved conflicts for merge of 8abea101 to masterEvan Charlton
2014-05-14am cd5b560d: (-s ours) am c72244cd: (-s ours) am c98f5b33: (-s ours) am 03afe...Baligh Uddin
2014-05-14am 6e017333: Address comments about post dialSailesh Nepal
2014-05-14am b48e2280: InCallUI: Use Telecomm CallCapabilitesSailesh Nepal
2014-05-14am 07a822b2: InCallUI: Use telecomm presentation and gateway infoSailesh Nepal
2014-05-14am 6af0c61c: InCallUI - Use String IDsSailesh Nepal
2014-05-14resolved conflicts for merge of fc22ba88 to masterEvan Charlton
2014-05-14resolved conflicts for merge of af680f72 to masterEvan Charlton
2014-05-14Make the dialpad fully opaque.Andrew Lee
2014-05-14am d5b3b757: Update to disconnect-cause APIs.Santos Cordon
2014-05-14am d980dd9c: am e1c9e81c: Merge "Don\'t show wait dialog if the activity is p...Andrew Lee
2014-05-14resolved conflicts for merge of 9d031ca4 to masterEvan Charlton
2014-05-14am d2ebc741: (-s ours) am b9f216ee: (-s ours) am 7be11856: (-s ours) am d8df5...Baligh Uddin
2014-05-14am c7457fe1: Merge "Swap calls when clicking on secondary photo in InCallUI" ...Yorke Lee
2014-05-14am 139e5d7b: (-s ours) am 2d7ad753: am 6d0bb796: (-s ours) am 63440e01: am a9...ihab@google.com
2014-05-14am 49aa6606: (-s ours) am 85e7278f: (-s ours) am 5d72e05a: (-s ours) am 8258f...Baligh Uddin
2014-05-14am 23d627a3: (-s ours) am b612ff49: (-s ours) am a52b892e: (-s ours) am a49b9...Baligh Uddin
2014-05-14am 48724448: am d869b5be: am 8eb9cd16: am 5d0ea3d8: am ca837aa0: resolved con...Yorke Lee
2014-05-14am 659699f9: (-s ours) am 104c5968: (-s ours) Merge "Import translations. DO ...Baligh Uddin
2014-05-14am 580f1abe: am 6f61f0b8: Merge "Remove extra recycle() call"Alan Viverette
2014-05-14am 50616b48: am 74abd42a: Remove extra recycle() callAlan Viverette
2014-05-14am b046ff55: (-s ours) am f0d9f7d0: am 85745217: (-s ours) am e8b8539e: am ea...Ihab Awad
2014-05-14am f1b9476b: am 58dd39c5: am 4149f823: (-s ours) am c756251e: am 00abc03c: re...ihab@google.com
2014-05-14resolved conflicts for merge of 09f0ba61 to masterEvan Charlton
2014-05-14am bef39891: am 56ad9dd9: Fix for in-call dialpad not sliding full length of ...Yorke Lee
2014-05-14am 8741f755: Merge "Add gateway support to InCallUI" into master-novaYorke Lee
2014-05-14am cee969e4: am 2902e079: Merge "Fix build breakage: Fix an ID syntax error."Ihab Awad
2014-05-14am e0e26663: am 74067fbe: Merge "Rearrange dialpad layout for better esthetics."Ihab Awad
2014-05-14am 954651f2: am 3be990f2: Fix NPE in ConferenceManagerPresenterJay Shrauner
2014-05-14am 34f73562: Support a second incoming call (call-waiting)Santos Cordon
2014-05-14am 4075acf9: Merge "InCallUI: Use Uri for handle" into master-novaSailesh Nepal
2014-05-14am b94c59d4: (-s ours) am b39c760f: am af19c7d5: (-s ours) am 1ca439de: am 11...Yorke Lee
2014-05-14am 4ff988d7: am d4cab967: Merge "Request FLAG_SHOW_WHEN_LOCKED for respond vi...Yorke Lee
2014-05-14am 190a89a4: (-s ours) am 7d298cb0: (-s ours) am ffc9dd5e: (-s ours) am 3abf9...Geoff Mendal
2014-05-14am e217b7e8: (-s ours) am 52913829: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
2014-05-14am 7d19c79a: Merge "Modify InCallUI to hold/unhold calls through Telecomm" in...Yorke Lee
2014-05-14am 1fa328a3: am 1f3c8dd1: am 38b2168e: (-s ours) am 6284d78e: am 94878185: Fi...Yorke Lee
2014-05-14am 59a487f6: am 575443a2: am 9049f721: (-s ours) am 76057155: am b47b996c: re...Yorke Lee
2014-05-14am 54a11af4: (-s ours) am ffbdb6f1: am d72e7fb5: (-s ours) am 2131c19a: am f3...Yorke Lee
2014-05-14am 98f5cc98: am b0ede729: am 03ec835d: am 4ef0d01b: am b547c5e9: Merge commit...Yorke Lee
2014-05-14am 26c837ec: Merge "Update InCallUI to use new Telecomm wrappers" into master...Sailesh Nepal
2014-05-14am 5fba58e2: (-s ours) am a40d6077: (-s ours) Merge "Import translations. DO ...Baligh Uddin
2014-05-14am 484070f9: am c09452d2: Fix NPE in DialpadFragment.onHover when fragment is...Yorke Lee
2014-05-14am 7ed31984: am ea648d1e: Fix IllegalStateException in InCallUIYorke Lee
2014-05-14am 23547ce4: (-s ours) am 5bf40b62: am f4fa53ac: (-s ours) am 4fd73dd6: am 20...Ihab Awad
2014-05-14resolved conflicts for merge of 13381079 to masterEvan Charlton
2014-05-14am 1824b2e2: am 022d0e9d: answer should be on the rightChris Wren
2014-05-14am 37690ce7: am 35483376: am 2d0353d1: am 94c325e4: am 02d0829c: am 2856d0b0:...Jay Shrauner
2014-05-14am beac1a8d: am 681154aa: am bbc6c598: am 091432fd: am b3749214: am f49d42e4:...Jay Shrauner
2014-05-14am e553d43b: InCall UI changes for incoming Telecomm calls.Santos Cordon
2014-05-14am 65ece226: am d52e4929: add actions to the incoming call notificationChris Wren
2014-05-14am d9adc4f7: am 757f6653: Merge "only disable the system bars when inCallActi...Chris Wren
2014-05-14am 23be40f4: am d8babfb9: Merge "always add full screen intent if a call is i...Chris Wren
2014-05-14am 88d08543: (-s ours) am 18cd7052: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-05-14am e0cabfb9: Set initial connect timeSailesh Nepal
2014-05-14am 2504d5cd: (-s ours) am 90116e9e: (-s ours) am 7bcea219: (-s ours) am 3b6cf...Baligh Uddin
2014-05-14resolved conflicts for merge of e3a1a624 to masterEvan Charlton
2014-05-14am 166aa8d5: Add implementation of InCallService.Santos Cordon