summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am c60d6ab8: am d866f500: Merge "Add new API shouldOfferSwitchingToNextInputM...Satoshi Kataoka2013-08-231-0/+1
|\
| * Merge "Add new API shouldOfferSwitchingToNextInputMethod" into klp-devSatoshi Kataoka2013-08-231-0/+1
| |\
| | * Add new API shouldOfferSwitchingToNextInputMethodSatoshi Kataoka2013-08-221-0/+1
| * | Remove input flinger stubs. (DO NOT MERGE)Jeff Brown2013-08-221-1/+0
* | | am 2efb6cb7: am 76cf8fe7: Merge "Add ability to test supported content types ...Jeff Tinker2013-08-221-0/+1
|\ \ \ | |/ /
| * | Merge "Add ability to test supported content types to MediaDrm" into klp-devJeff Tinker2013-08-221-0/+1
| |\ \
| | * | Add ability to test supported content types to MediaDrmJeff Tinker2013-08-211-0/+1
* | | | am 6d44d8fa: am 8e3a4173: Merge "Expose API to query devices for supported ke...Michael Wright2013-08-221-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Expose API to query devices for supported keys" into klp-devMichael Wright2013-08-221-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Expose API to query devices for supported keysMichael Wright2013-08-191-0/+1
| * | | Extend AlarmClock API (just slightly)Sam Blitzstein2013-08-211-0/+7
* | | | Merge "Extend AlarmClock API (just slightly)"Sam Blitzstein2013-08-211-0/+7
|\ \ \ \
| * | | | Extend AlarmClock API (just slightly)Sam Blitzstein2013-08-201-0/+7
* | | | | am b5d4ce96: am ba75bbe3: Camera2: Fix build: add temperature entry to camera...Eino-Ville Talvala2013-08-211-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Camera2: Fix build: add temperature entry to camera public APIEino-Ville Talvala2013-08-211-0/+1
* | | | | am 908d9bfa: am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.O...Chris Craik2013-08-211-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Add inPremutiplied option to BitmapFactory.Options, functionality in BitmapChris Craik2013-08-201-0/+2
* | | | | am 1e698982: am a37e2346: Merge "Warn that SettingInjectorService must be fas...Tom O'Neill2013-08-201-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Warn that SettingInjectorService must be fast" into klp-devTom O'Neill2013-08-211-0/+1
| |\ \ \ \
| | * | | | Warn that SettingInjectorService must be fastTom O'Neill2013-08-191-0/+1
| | | |/ / | | |/| |
* | | | | am cd38fdb2: am 59bbba7c: Merge "Add implicit parent dependency for Preferenc...Alan Viverette2013-08-201-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add implicit parent dependency for Preferences" into klp-devAlan Viverette2013-08-201-0/+1
| |\ \ \ \
| | * | | | Add implicit parent dependency for PreferencesAlan Viverette2013-08-191-0/+1
| | |/ / /
* | | | | am be88e35d: am d3092167: Merge "Implemented advanced printer selection and A...Svetoslav2013-08-201-5/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Implemented advanced printer selection and API refactoring." into klp-devSvetoslav2013-08-201-5/+9
| |\ \ \ \
| | * | | | Implemented advanced printer selection and API refactoring.Svetoslav2013-08-191-5/+9
* | | | | | am 74f5c5d3: am 23657458: Merge "Change abortReliableWrite(BluetoothDevice) t...Matthew Xie2013-08-201-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()" in...Matthew Xie2013-08-201-1/+2
| |\ \ \ \ \
| | * | | | | Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()John Du2013-08-191-1/+2
* | | | | | | am 1cb4d42c: am a3132d97: Merge "MediaPlayer.TrackInfo: add getFormat() metho...Chong Zhang2013-08-201-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-devChong Zhang2013-08-201-0/+1
| |\ \ \ \ \ \
| | * | | | | | MediaPlayer.TrackInfo: add getFormat() methodLajos Molnar2013-08-151-0/+1
* | | | | | | | am 19eefb20: am f23993fb: Merge "Add the API to set and read the location mod...Tom O'Neill2013-08-201-2/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add the API to set and read the location mode" into klp-devTom O'Neill2013-08-201-2/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Add the API to set and read the location modeTom O'Neill2013-08-191-2/+10
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge "Make color filters mutable"Romain Guy2013-08-201-3/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make color filters mutableRomain Guy2013-08-191-3/+14
| |/ / / / / /
* | | | | | | Merge changes Id3815fe8,I90a85921 into klp-devJeff Brown2013-08-191-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Define AudioSource.REMOTE_SUBMIX.Jeff Brown2013-08-191-0/+1
* | | | | | | Merge "NFC: Allow HostApduService to indicate transaction unhandled." into kl...Martijn Coenen2013-08-191-1/+3
|\ \ \ \ \ \ \
| * | | | | | | NFC: Allow HostApduService to indicate transaction unhandled.Martijn Coenen2013-08-191-1/+3
* | | | | | | | Merge "Expose WifiManager.setTdlsEnabled public API" into klp-devVinit Deshapnde2013-08-191-0/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Expose WifiManager.setTdlsEnabled public APIVinit Deshapnde2013-08-161-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_S...Andreas Huber2013-08-191-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOPAndreas Huber2013-08-141-0/+2
| |/ / / / /
* | | | | | Merge "Resized thumbnails; async; extend MatrixCursor." into klp-devJeff Sharkey2013-08-181-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Resized thumbnails; async; extend MatrixCursor.Jeff Sharkey2013-08-171-0/+1
* | | | | | Merge "Richer ParcelFileDescriptor close events." into klp-devJeff Sharkey2013-08-171-2/+13
|\ \ \ \ \ \
| * | | | | | Richer ParcelFileDescriptor close events.Jeff Sharkey2013-08-161-2/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Better Transition interruption" into klp-devChet Haase2013-08-161-4/+6
|\ \ \ \ \ \