summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-05-01Merge "Always show the call state text view."Andrew Lee
2014-04-30am 5b3cd2cc: am d968d1a2: Merge klp-dev-plus-aosp into stage-aosp-masterBill Yi
2014-04-30am d968d1a2: Merge klp-dev-plus-aosp into stage-aosp-masterBill Yi
2014-04-29Merge klp-dev-plus-aosp into stage-aosp-masterBill Yi
2014-04-28Always show the call state text view.Andrew Lee
2014-04-28Import translations. DO NOT MERGEBaligh Uddin
2014-04-25Use ShapeDrawable for floating end call button in InCallUIYorke Lee
2014-04-24Position InCall dialpad underneath end call button.Andrew Lee
2014-04-24Make EndCallButton circular.Andrew Lee
2014-04-24Merge "Restyle text in primary call info."Andrew Lee
2014-04-24Restyle text in primary call info.Andrew Lee
2014-04-23Properly enable/disable end call button.Andrew Lee
2014-04-23Relocate EndCallButton and CallButtonFragment.Andrew Lee
2014-04-23Change InCallUI colors to teal.Andrew Lee
2014-04-23Removed unused stringsJay Shrauner
2014-04-02am c98f5b33: (-s ours) am 03afe40c: (-s ours) am 17c85730: (-s ours) Import t...Baligh Uddin
2014-04-02am 03afe40c: (-s ours) am 17c85730: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-04-02am 17c85730: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-04-02Import translations. DO NOT MERGEBaligh Uddin
2014-03-31Merge "Don't show wait dialog if the activity is paused."Andrew Lee
2014-03-28Don't show wait dialog if the activity is paused.Andrew Lee
2014-03-28manually merge 9b4962cb into masterColin Cross
2014-03-28Fix issue introduced by 5feee861: there is no longer an UNKNOWN DisconnectsCa...Anders Kristensen
2014-03-28resolved conflicts for merge of 5feee861 to klp-modular-dev-plus-aospAnders Kristensen
2014-03-28Merge "Remove duplicate call disconnect codes."Anders Kristensen
2014-03-28Remove duplicate call disconnect codes.Anders Kristensen
2014-03-27am 7be11856: (-s ours) am d8df587e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-03-27am d8df587e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-03-26Import translations. DO NOT MERGEBaligh Uddin
2014-03-25am 6d0bb796: (-s ours) am 63440e01: am a962af00: Merge "DO NOT MERGE. One-tim...ihab@google.com
2014-03-25am 63440e01: am a962af00: Merge "DO NOT MERGE. One-time patch change to resol...ihab@google.com
2014-03-25am 5d72e05a: (-s ours) am 8258f111: (-s ours) am 904dde27: (-s ours) Merge "I...Baligh Uddin
2014-03-25am a52b892e: (-s ours) am a49b916a: (-s ours) am d838ebc6: (-s ours) am bc01c...Baligh Uddin
2014-03-25am 8eb9cd16: am 5d0ea3d8: am ca837aa0: resolved conflicts for merge of 9e1f62...Yorke Lee
2014-03-25am a962af00: Merge "DO NOT MERGE. One-time patch change to resolve difference...ihab@google.com
2014-03-25Merge "DO NOT MERGE. One-time patch change to resolve differences where klp-m...repo sync
2014-03-25DO NOT MERGE. One-time patch change to resolve differences whererepo sync
2014-03-25am 8258f111: (-s ours) am 904dde27: (-s ours) Merge "Import translations. DO ...Baligh Uddin
2014-03-25am 904dde27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-mod...Baligh Uddin
2014-03-25Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin
2014-03-25Merge "Import translations. DO NOT MERGE"Baligh Uddin
2014-03-25Merge "Remove extra recycle() call"Alan Viverette
2014-03-25Remove extra recycle() callAlan Viverette
2014-03-25Remove extra recycle() callAlan Viverette
2014-03-25am a49b916a: (-s ours) am d838ebc6: (-s ours) am bc01c0e8: (-s ours) am 45ab8...Baligh Uddin
2014-03-25am d838ebc6: (-s ours) am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "I...Baligh Uddin
2014-03-25am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO ...Baligh Uddin
2014-03-25am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO ...Baligh Uddin
2014-03-25am 45ab8271: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin
2014-03-25Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin
2014-03-25am 5d0ea3d8: am ca837aa0: resolved conflicts for merge of 9e1f62f0 to klp-mod...Yorke Lee
2014-03-25am ca837aa0: resolved conflicts for merge of 9e1f62f0 to klp-modular-devYorke Lee
2014-03-24resolved conflicts for merge of 9e1f62f0 to klp-modular-devYorke Lee
2014-03-25am 85745217: (-s ours) am e8b8539e: am eaac9c5f: am dd7e06ab: am f4373c93: DO...Ihab Awad
2014-03-25am e8b8539e: am eaac9c5f: am dd7e06ab: am f4373c93: DO NOT MERGE. Fix build b...Ihab Awad
2014-03-25am eaac9c5f: am dd7e06ab: am f4373c93: DO NOT MERGE. Fix build breakage: Fix ...Ihab Awad
2014-03-25am dd7e06ab: am f4373c93: DO NOT MERGE. Fix build breakage: Fix an ID syntax ...Ihab Awad
2014-03-25am 4149f823: (-s ours) am c756251e: am 00abc03c: resolved conflicts for merge...ihab@google.com
2014-03-25am c756251e: am 00abc03c: resolved conflicts for merge of 0689fe99 to klp-mod...ihab@google.com
2014-03-25am 00abc03c: resolved conflicts for merge of 0689fe99 to klp-modular-devihab@google.com
2014-03-24resolved conflicts for merge of 0689fe99 to klp-modular-devrepo sync
2014-03-24am 9e1f62f0: am b1fc41c9: DO NOT MERGE Fix for in-call dialpad not sliding fu...Yorke Lee
2014-03-24am b1fc41c9: DO NOT MERGE Fix for in-call dialpad not sliding full length of ...Yorke Lee
2014-03-24DO NOT MERGE Fix for in-call dialpad not sliding full length of screenYorke Lee
2014-03-24Fix for in-call dialpad not sliding full length of screenYorke Lee
2014-03-24Import translations. DO NOT MERGEBaligh Uddin
2014-03-24Import translations. DO NOT MERGEBaligh Uddin
2014-03-24Import translations. DO NOT MERGEBaligh Uddin
2014-03-22am dd7e06ab: am f4373c93: DO NOT MERGE. Fix build breakage: Fix an ID syntax ...Ihab Awad
2014-03-22am f4373c93: DO NOT MERGE. Fix build breakage: Fix an ID syntax error.Ihab Awad
2014-03-21DO NOT MERGE. Fix build breakage: Fix an ID syntax error.Ihab Awad
2014-03-22Merge "Fix build breakage: Fix an ID syntax error."Ihab Awad
2014-03-21Fix build breakage: Fix an ID syntax error.Ihab Awad
2014-03-21am 0689fe99: am 559d7c9b: DO NOT MERGE. Rearrange dialpad layout for better e...Ihab Awad
2014-03-21am 559d7c9b: DO NOT MERGE. Rearrange dialpad layout for better esthetics.Ihab Awad
2014-03-21DO NOT MERGE. Rearrange dialpad layout for better esthetics.Ihab Awad
2014-03-21Merge "Rearrange dialpad layout for better esthetics."Ihab Awad
2014-03-21Rearrange dialpad layout for better esthetics.Ihab Awad
2014-03-21Fix NPE in ConferenceManagerPresenterJay Shrauner
2014-03-18am af19c7d5: (-s ours) am 1ca439de: am 11d84a57: am 33321cad: am 73456faf: DO...Yorke Lee
2014-03-18am 1ca439de: am 11d84a57: am 33321cad: am 73456faf: DO NOT MERGE Request FLAG...Yorke Lee
2014-03-18am 11d84a57: am 33321cad: am 73456faf: DO NOT MERGE Request FLAG_SHOW_WHEN_LO...Yorke Lee
2014-03-18am 33321cad: am 73456faf: DO NOT MERGE Request FLAG_SHOW_WHEN_LOCKED for resp...Yorke Lee
2014-03-18am 33321cad: am 73456faf: DO NOT MERGE Request FLAG_SHOW_WHEN_LOCKED for resp...Yorke Lee
2014-03-18am 73456faf: DO NOT MERGE Request FLAG_SHOW_WHEN_LOCKED for respond via text ...Yorke Lee
2014-03-18Merge "Request FLAG_SHOW_WHEN_LOCKED for respond via text dialogs"Yorke Lee
2014-03-18DO NOT MERGE Request FLAG_SHOW_WHEN_LOCKED for respond via text dialogsYorke Lee
2014-03-17Request FLAG_SHOW_WHEN_LOCKED for respond via text dialogsYorke Lee
2014-03-17am ffc9dd5e: (-s ours) am 3abf9a31: (-s ours) am c7e9e39d: (-s ours) am 123c6...Geoff Mendal
2014-03-17am 3abf9a31: (-s ours) am c7e9e39d: (-s ours) am 123c62a0: (-s ours) am 58e89...Geoff Mendal
2014-03-17am c7e9e39d: (-s ours) am 123c62a0: (-s ours) am 58e89bee: (-s ours) Import t...Geoff Mendal
2014-03-17am 123c62a0: (-s ours) am 58e89bee: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
2014-03-17am 123c62a0: (-s ours) am 58e89bee: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
2014-03-17am 58e89bee: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
2014-03-17Import translations. DO NOT MERGEGeoff Mendal
2014-03-17Import translations. DO NOT MERGEGeoff Mendal
2014-03-14am 38b2168e: (-s ours) am 6284d78e: am 94878185: Fix build break due to bad m...Yorke Lee
2014-03-14am 9049f721: (-s ours) am 76057155: am b47b996c: resolved conflicts for merge...Yorke Lee
2014-03-14am 6284d78e: am 94878185: Fix build break due to bad mergeYorke Lee
2014-03-14am 94878185: Fix build break due to bad mergeYorke Lee