summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of s...Evan Charlton2014-05-141-1/+1
* merge master nova by hand, skipped translationsEd Heyl2014-05-141-0/+311
|\
| * am 9fca9ecb: Merge "notification ranking infrastructure"Chris Wren2014-05-121-1/+9
| |\
| * \ am 9a273b89: Merge "Support for hollow switch and seek bar thumbs"Alan Viverette2014-05-121-0/+5
| |\ \
| * \ \ am d4accb98: Merge "Define audio attributes"Jean-Michel Trivi2014-05-121-0/+39
| |\ \ \
| * \ \ \ am 7b7d5e43: Merge "New, inkier EdgeEffect visual style"Adam Powell2014-05-111-0/+2
| |\ \ \ \
| * \ \ \ \ am d4de9b44: Merge "Adding shell command execution to UiAutomation."Svetoslav2014-05-111-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ am 133d4e92: Merge "Fix Os.link apicheck breakage."Elliott Hughes2014-05-101-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API""Adam Powell2014-05-102-8/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 82902c45: Merge "Remove the View#initializeScrollbars API"Adam Powell2014-05-102-1/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 53e4004b: Merge "Added MediaCodec.releaseOutputBuffer() method with render...Lajos Molnar2014-05-091-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 9f4c7f31: Animated state transition drawableAlan Viverette2014-05-091-0/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 750a2b05: Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT"Glenn Kasten2014-05-091-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls."Craig Mautner2014-05-091-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am b1786021: Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATIONBen Murdoch2014-05-091-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am e6d58c4c: Merge "Introduce new API for floating window support"Yohei Yukawa2014-05-091-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 6a4c12da to master-novaElliott Hughes2014-05-081-0/+670
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5aa45ef5: Merge "HCE/SE foreground support."Martijn Coenen2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 59969600: Merge "Add android.hardware.camera.external feature."Eino-Ville Talvala2014-05-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task"justinzhang2014-05-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f5a4eabb: Merge "New user restrictions for EDU"Emily Bernier2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3225a6b5: Further cleaning on animated part of VectorDrawable.ztenghui2014-05-081-56/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 720f52c1: Merge "Unhide AudioTrack.write() method for non-blocking and Byt...Jean-Michel Trivi2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d5cd652: Merge "Add API to disable account management for certain types o...Sander Alewijnse2014-05-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 20d80a4a: Merge "Quantum notification improvements."Dan Sandler2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a05be305: Merge "Unhide further 1.7-era APIs"Neil Fuller2014-05-081-1/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6eb4c5bf: Merge "Add flags to context creation for RS"Jason Sams2014-05-081-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 91c091cf: Merge "State based animators for Views"Alan Viverette2014-05-081-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" int...Vinod Krishnan2014-05-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eb440873: Camera: remove some DNG tagsZhijun He2014-05-071-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6e6d1f21: Merge "Make Lock Task API public."Jason Monk2014-05-071-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 059637c4: Merge "Make proxy API public"Jason Monk2014-05-071-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0f4b0ba6: Merge "Add a class for managing Session priority"RoboErik2014-05-071-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 13ca0e29: Merge "Add APIs for creating a system priority session and getti...RoboErik2014-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d5a99922: Merge "Add attributes and flags for DocCentric."Craig Mautner2014-05-071-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e068ba87: Add enableSystemApp methods to DevicePolicyManagerAdam Connors2014-05-071-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5d24ddf3: Add new EDU user restrictions.Julia Reynolds2014-05-071-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e3172101: am bfbddcad: am 4f295fe8: Merge "Clean up WindowInsets API for r...Adam Powell2014-05-071-12/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am db62ab87: Revert "Add attributes and flags for DocCentric."Ben Murdoch2014-05-071-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5a8c07a2: Add attributes and flags for DocCentric.Craig Mautner2014-05-071-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1091e2c9: Public WebView permission APITao Bai2014-05-071-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d031e36c: First pass at adding FingerprintManagerServiceJim Miller2014-05-071-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31c0962a: Merge "Fix crash due to texture view callback threading invarian...Jeff Brown2014-05-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b9c2108: Unhide new SSL APIsKenny Root2014-05-061-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1bb5da95: Camera2: Add missing capture result tagsZhijun He2014-05-061-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f85f16c: am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" ...Adam Powell2014-05-061-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3439728c: Fix bad merge.Tim Kilbourn2014-05-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6824d13d: am f7330ac7: am 989dab11: Update current.txt after hiding isGame.Tim Kilbourn2014-05-061-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c822b63a: Merge "First step on API cleaning on the VectorDrawable to disab...ztenghui2014-05-061-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 168ed3dc: Merge "Cleaning code related to the forwarding intent filters."Nicolas Prevot2014-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \