summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Navigation hideybar via new system ui opt-in flag.John Spurlock2013-05-081-0/+1
* New UndoManager.Dianne Hackborn2013-05-071-0/+55
* resolved conflicts for merge of 78df7b5e to masterJesse Hall2013-05-061-1/+9
|\
| * Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-devJesse Hall2013-05-041-1/+9
| |\
| | * Add android.opengl.EGLExt class for EGL extensionsJesse Hall2013-05-011-1/+9
* | | am b0675df8: am faa47b52: Merge "Idle maintenance scheduling broken." into jb...Svetoslav2013-05-061-2/+0
|\ \ \ | |/ /
| * | Idle maintenance scheduling broken.Svetoslav2013-05-031-2/+0
* | | Merge "Unhide extra to fix docs build."Jeff Sharkey2013-05-021-0/+1
|\ \ \
| * | | Unhide extra to fix docs build.Jeff Sharkey2013-05-011-0/+1
* | | | Merge "Start fleshing out new storage APIs."Jeff Sharkey2013-05-021-0/+25
|\ \ \ \ | |/ / /
| * | | Start fleshing out new storage APIs.Jeff Sharkey2013-05-011-0/+25
* | | | am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle e...Jeff Tinker2013-05-011-6/+18
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ...Jeff Tinker2013-05-011-6/+18
| |\ \ | | |/ | |/|
| | * MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-301-6/+18
* | | Remove obsolete OMA-DRM supportMike Lockwood2013-04-291-3/+3
* | | Decorate AssetFileDescriptor with Closeable.Jeff Sharkey2013-04-291-1/+1
* | | am 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-devAmith Yamasani2013-04-251-1/+0
|\ \ \ | |/ /
| * | Merge "Hide isLinkedUser()" into jb-mr2-devAmith Yamasani2013-04-261-1/+0
| |\ \
| | * | Hide isLinkedUser()Amith Yamasani2013-04-251-1/+0
* | | | am 56f7afb0: am cc165d16: Merge "Fix build." into jb-mr2-devDaniel Sandler2013-04-251-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix build." into jb-mr2-devDaniel Sandler2013-04-251-1/+1
| |\ \ \
| | * | | Fix build.Daniel Sandler2013-04-251-1/+1
* | | | | am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-m...Daniel Sandler2013-04-251-8/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "API cleanup: NotificationListener" into jb-mr2-devDaniel Sandler2013-04-251-8/+7
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | API cleanup: NotificationListenerDaniel Sandler2013-04-251-8/+7
* | | | am fa1c4430: am 5e97c317: Merge "New NotificationListener API: getActiveNotif...Daniel Sandler2013-04-251-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-devDaniel Sandler2013-04-251-0/+1
| |\ \ \ | | |/ /
| | * | New NotificationListener API: getActiveNotifications()Daniel Sandler2013-04-241-0/+1
* | | | am 269c068d: am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no vis...Amith Yamasani2013-04-251-1/+0
|\ \ \ \ | |/ / /
| * | | Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.Amith Yamasani2013-04-241-1/+0
| |/ /
* | | am 2e0a94d2: am b442d074: Merge "Add hardware feature android.hardware.blueto...Matthew Xie2013-04-231-0/+1
|\ \ \ | |/ /
| * | Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-devMatthew Xie2013-04-231-0/+1
| |\ \
| | * | Add hardware feature android.hardware.bluetooth.leMatthew Xie2013-04-231-0/+1
| * | | Adding matching @deprecated.Ian Rogers2013-04-231-1/+1
| | |/ | |/|
* | | am 896ee5b6: am be4536d2: Merge "Adding matching @deprecated."Ian Rogers2013-04-231-1/+1
|\ \ \
| * \ \ am be4536d2: Merge "Adding matching @deprecated."Ian Rogers2013-04-231-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Adding matching @deprecated.Ian Rogers2013-04-191-1/+1
| | * | Fix build.Elliott Hughes2013-03-181-2/+2
* | | | am 7bf02d12: am a61464d7: Merge "Making new node id APIs return strings." int...Svetoslav2013-04-231-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Making new node id APIs return strings." into jb-mr2-devSvetoslav2013-04-231-2/+2
| |\ \ \
| | * | | Making new node id APIs return strings.Svetoslav2013-04-221-2/+2
* | | | | resolved conflicts for merge of 8c3cb811 to masterDianne Hackborn2013-04-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | JB MR2 == API 18.Dianne Hackborn2013-04-221-1/+1
| |/ / /
* | | | am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bi...Fabrice Di Meglio2013-04-201-43/+22
|\ \ \ \ | |/ / /
| * | | Fix bug #8656546 API REVIEW: android.text.bidi / android.textFabrice Di Meglio2013-04-191-43/+22
* | | | am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify ...Jeff Tinker2013-04-191-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Correct algorithm property name and clarify javadoc description of dev...Jeff Tinker2013-04-191-1/+1
| |\ \ \
| | * | | Correct algorithm property name and clarify javadoc description ofJeff Tinker2013-04-191-1/+1
* | | | | am dd240d9a: am 0935f258: Merge "Updating API based on feedback" into jb-mr2-devJason Sams2013-04-191-12/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Updating API based on feedback" into jb-mr2-devJason Sams2013-04-191-12/+0
| |\ \ \ \