summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add the abort API to ICallService implementations." into master-novaBen Gilad2014-03-061-1/+2
|\
| * Add the abort API to ICallService implementations.Ben Gilad2014-03-051-1/+2
* | am b7d0cfa0: Merge "Add Path.isConvex, and force View outlines to be convex"Chris Craik2014-03-061-0/+1
|\ \
| * \ Merge "Add Path.isConvex, and force View outlines to be convex"Chris Craik2014-03-061-0/+1
| |\ \
| | * | Add Path.isConvex, and force View outlines to be convexChris Craik2014-03-031-0/+1
* | | | am 5ab31155: am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and ...Griff Hazen2014-03-061-0/+2
|\ \ \ \ | |/ / /
| * | | am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to ...Griff Hazen2014-03-061-0/+2
| |\ \ \
| | * \ \ am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." int...Griff Hazen2014-03-061-0/+2
| | |\ \ \
| | | * | | Add addExtras and getExtras to Notification.Builder.Griff Hazen2014-03-051-0/+2
* | | | | | Add optional data to incoming callsEvan Charlton2014-03-051-2/+3
| |_|_|_|/ |/| | | |
* | | | | Fix the buildEvan Charlton2014-03-051-0/+1
* | | | | am 4b131046: Revert "Revert "Fix the build.""Alan Viverette2014-03-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert "Fix the build.""Alan Viverette2014-03-051-1/+1
* | | | | am 9e0c0a6e: Revert "Fix the build."Alan Viverette2014-03-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Fix the build."Alan Viverette2014-03-051-1/+1
* | | | | am 737629a3: Fix the build.Alan Viverette2014-03-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix the build.Alan Viverette2014-03-041-1/+1
* | | | | am 568628dc: Manually merge commit \'2faf28cf\' into masterWill Haldean Brown2014-03-041-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | Manually merge commit '2faf28cf' into masterWill Haldean Brown2014-03-041-0/+5
| |\ \ \ \ | | |/ / /
| | * | | am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-mo...Will Haldean Brown2014-03-041-0/+5
| | |\ \ \ | | | |/ /
| | | * | Add swipe-to-dismiss support to PhoneWindow.Will Haldean Brown2014-03-041-0/+5
* | | | | am add749f6: Camera2: make shading.mode key publicZhijun He2014-03-041-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | Camera2: make shading.mode key publicZhijun He2014-03-041-0/+5
* | | | | am 5e3e630d: Merge "Injected settings no longer include summaries"Tom O'Neill2014-03-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Injected settings no longer include summariesTom O'Neill2014-03-031-1/+1
* | | | | am 77b987f1: Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-0/+7
| | |_|/ | |/| |
* | | | am ef238651: Merge "API changes for 64 bit platforms."Narayan Kamath2014-02-281-2/+4
|\ \ \ \ | |/ / /
| * | | Merge "API changes for 64 bit platforms."Narayan Kamath2014-02-281-2/+4
| |\ \ \
| | * | | API changes for 64 bit platforms.Narayan Kamath2014-02-271-2/+4
* | | | | am 17c402d6: Merge "Add support for USB devices with multiple configurations ...Mike Lockwood2014-02-271-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | Add support for USB devices with multiple configurations and alternate interf...Mike Lockwood2014-02-271-0/+20
* | | | | am 94b5ca81: Merge "Change Activity Scene Transitions to be more automatic re...George Mount2014-02-271-15/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Change Activity Scene Transitions to be more automatic redo."George Mount2014-02-271-15/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change Activity Scene Transitions to be more automatic redo.George Mount2014-02-261-15/+11
* | | | | am 813d85b8: Fix progress bar tinting, add tint support to ShapeDrawableAlan Viverette2014-02-261-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | Fix progress bar tinting, add tint support to ShapeDrawableAlan Viverette2014-02-261-2/+5
| |/ / /
* | | | am 9d1ae3b8: Merge "Added support for WiFi frequency on WifiInfo (getter, set...Felipe Leme2014-02-261-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Added support for WiFi frequency on WifiInfo (getter, settter, and fre...Felipe Leme2014-02-261-0/+2
| |\ \ \
| | * | | Added support for WiFi frequency on WifiInfo (getter, settter, and frequency ...Felipe Leme2014-02-051-1/+3
* | | | | resolved conflicts for merge of 8fb4cf1e to master-novaRoboErik2014-02-261-44/+48
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Move Session apis to android.media.session"RoboErik2014-02-261-44/+48
| |\ \ \ \
| | * | | | Move Session apis to android.media.sessionRoboErik2014-02-251-44/+48
* | | | | | am 206e30cd: Revert "Change Activity Scene Transitions to be more automatic."George Mount2014-02-261-11/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "Change Activity Scene Transitions to be more automatic."George Mount2014-02-261-11/+15
* | | | | | am 8fcd3248: Regen current.txt to fix incorrect id for requiredForProfileAmith Yamasani2014-02-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Regen current.txt to fix incorrect id for requiredForProfileAmith Yamasani2014-02-251-1/+1
* | | | | | am 121e25dc: Merge "Change Activity Scene Transitions to be more automatic."George Mount2014-02-251-14/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Change Activity Scene Transitions to be more automatic."George Mount2014-02-251-14/+10
| |\ \ \ \ \
| | * | | | | Change Activity Scene Transitions to be more automatic.George Mount2014-02-251-14/+10