summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-devMartijn Coenen2013-09-101-1/+1
|\
| * Merge "Remove legacy HCE APIs." into klp-devMartijn Coenen2013-09-101-1/+1
| |\
| | * Remove legacy HCE APIs.Martijn Coenen2013-09-041-1/+1
* | | am 10779b12: am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now...Glenn Kasten2013-09-101-1/+1
|\ \ \ | |/ /
| * | Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-devGlenn Kasten2013-09-101-1/+1
| |\ \
| | * | AudioTrack.getTimestamp() return type is now booleanGlenn Kasten2013-09-091-1/+1
* | | | am 78bb372f: am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-devJeff Sharkey2013-09-091-8/+6
|\ \ \ \ | |/ / /
| * | | Merge changes I7b3f4c68,I9f022a08 into klp-devJeff Sharkey2013-09-101-8/+6
| |\ \ \
| | * | | Rename offer() to add(), remove/hide some APIs.Jeff Sharkey2013-09-091-8/+6
* | | | | Merge "Add View constructor that supplies a default style resource"Alan Viverette2013-09-101-0/+78
|\ \ \ \ \
| * | | | | Add View constructor that supplies a default style resourceAlan Viverette2013-09-091-0/+78
* | | | | | am e6139bf0: am 85e7177a: Merge "Move public consts to HotwordRecognitionServ...Sandeep Siddhartha2013-09-091-0/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Move public consts to HotwordRecognitionService" into klp-devSandeep Siddhartha2013-09-091-0/+9
| |\ \ \ \ \
| | * | | | | Move public consts to HotwordRecognitionServiceSandeep Siddhartha2013-09-061-0/+9
* | | | | | | am be4b4824: am bce89a42: Merge "Add updateListener to ViewPropertyAnimator" ...Chet Haase2013-09-091-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge "Add updateListener to ViewPropertyAnimator" into klp-devChet Haase2013-09-091-0/+1
| |\ \ \ \ \
| | * | | | | Add updateListener to ViewPropertyAnimatorChet Haase2013-09-091-0/+1
| | | |/ / / | | |/| | |
* | | | | | am b198dbaf: am 013634cc: Merge "Add WebVTT caption renderer" into klp-devAlan Viverette2013-09-091-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add WebVTT caption renderer" into klp-devAlan Viverette2013-09-091-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add WebVTT caption rendererAlan Viverette2013-09-061-3/+3
* | | | | | am 7c4f1492: am 30590646: Merge "Remember mode and sort on per-directory basi...Jeff Sharkey2013-09-091-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remember mode and sort on per-directory basis.Jeff Sharkey2013-09-091-0/+1
| | |_|/ / | |/| | |
* | | | | resolved conflicts for merge of ab98aec6 to masterNarayan Kamath2013-09-091-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Work on issue #10130785: Restore silence and vibrate settings..." into...Dianne Hackborn2013-09-081-0/+6
| |\ \ \ \
| | * | | | Work on issue #10130785: Restore silence and vibrate settings...Dianne Hackborn2013-09-061-0/+6
* | | | | | am 533587d8: am 9f4a392e: Merge "Unhide AudioTimestamp and getTimestamp" into...Eric Laurent2013-09-061-0/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Unhide AudioTimestamp and getTimestampGlenn Kasten2013-09-061-0/+7
| | |_|/ / | |/| | |
* | | | | am fc25c935: am c7deeffb: Updating current.txt after unhiding HotwordRecognit...Sandeep Siddhartha2013-09-061-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | Updating current.txt after unhiding HotwordRecognition APISandeep Siddhartha2013-09-061-0/+20
* | | | | am 3d6aa958: am fcf5809a: Merge "Sensor batching APIs for review." into klp-devAravind Akella2013-09-061-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Sensor batching APIs for review.Aravind Akella2013-09-061-0/+9
| |/ / /
* | | | am 775bdbdb: am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-devJeff Sharkey2013-09-061-0/+3
|\ \ \ \ | |/ / /
| * | | Provide calling package to ContentProviders.Jeff Sharkey2013-09-061-0/+2
| * | | Separate root and document management.Jeff Sharkey2013-09-061-0/+1
* | | | Merge "Fix broken javadocs"Matthew Williams2013-09-061-1/+9
|\ \ \ \
| * | | | Fix broken javadocsMatthew Williams2013-09-051-1/+9
* | | | | am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based o...Amith Yamasani2013-09-051-3/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "Remove unused APIs and rename others based on API review" into klp-devAmith Yamasani2013-09-051-3/+1
| |\ \ \
| | * | | Remove unused APIs and rename others based on API reviewAmith Yamasani2013-09-051-3/+1
| | |/ /
* | | | am c7b2112f: am 5d7acbd8: Merge "Filter roots based on supported MIME types."...Jeff Sharkey2013-09-051-4/+2
|\ \ \ \ | |/ / /
| * | | Merge "Filter roots based on supported MIME types." into klp-devJeff Sharkey2013-09-051-4/+2
| |\ \ \
| | * | | Filter roots based on supported MIME types.Jeff Sharkey2013-09-051-4/+2
* | | | | am f094655c: am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into ...Adam Powell2013-09-051-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add View#cancelPendingInputEvents API" into klp-devAdam Powell2013-09-051-0/+2
| |\ \ \ \
| | * | | | Add View#cancelPendingInputEvents APIAdam Powell2013-09-051-0/+2
* | | | | | am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KI...Chet Haase2013-09-051-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-devChet Haase2013-09-051-1/+1
| |\ \ \ \ \
| | * | | | | Change build version from KEY_LIME_PIE to KITKATChet Haase2013-09-051-1/+1
* | | | | | | am e2144155: am 2def6148: Merge "Hiding some unneeded APIs," into klp-devSvetoslav2013-09-051-2/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Hiding some unneeded APIs," into klp-devSvetoslav2013-09-051-2/+0
| |\ \ \ \ \ \