summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Ensure list scrolling API is in parity with view scrolling API" into k...Alan Viverette2013-09-031-4/+30
|\
| * Ensure list scrolling API is in parity with view scrolling APIAlan Viverette2013-09-031-4/+30
* | Merge "VideoView: add addSubtitleSource" into klp-devLajos Molnar2013-09-031-2/+66
|\ \
| * | VideoView: add addSubtitleSourceLajos Molnar2013-08-301-2/+66
* | | Merge "Block ble adv api based on resource config" into klp-devMatthew Xie2013-09-031-0/+8
|\ \ \
| * | | Block ble adv api based on resource configMatthew Xie2013-08-281-0/+8
* | | | Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" in...Dianne Hackborn2013-09-031-2/+4
|\ \ \ \
| * | | | Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLYDianne Hackborn2013-09-031-2/+4
| | |_|/ | |/| |
* | | | Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-devRomain Guy2013-09-031-6/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Update Bitmap.Config.ARGB_4444 documentationRomain Guy2013-09-031-6/+0
* | | | Merge "Don't call setLastChosen if it's a chooser activity instance" into klp...Amith Yamasani2013-09-031-83/+85
|\ \ \ \
| * | | | Don't call setLastChosen if it's a chooser activity instanceAmith Yamasani2013-09-031-83/+85
* | | | | Merge "Add drawable for Apdu Services, fix build." into klp-devMartijn Coenen2013-09-031-2/+2
|\ \ \ \ \
| * | | | | Add drawable for Apdu Services, fix build.Martijn Coenen2013-09-031-2/+2
* | | | | | Merge "Add tracing to WebView API methods and callbacks" into klp-devKristian Monsen2013-09-036-9/+119
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add tracing to WebView API methods and callbacksJonathan Dixon2013-08-306-9/+119
| |/ / / /
* | | | | NFC: @hide and remove abstract from processCommandApdu().Martijn Coenen2013-09-031-2/+5
* | | | | Merge "Bug fixes in the printer dialog activity and fused printer loader." in...Svetoslav Ganov2013-09-031-1/+1
|\ \ \ \ \
| * | | | | Bug fixes in the printer dialog activity and fused printer loader.Svetoslav Ganov2013-09-031-1/+1
* | | | | | Merge "Add doubletap swipe to scalegesturedetector" into klp-devMindy Pereira2013-09-031-13/+119
|\ \ \ \ \ \
| * | | | | | Add doubletap swipe to scalegesturedetectorMindy Pereira2013-08-291-13/+119
* | | | | | | Merge changes Ic710807d,I88dfcc8c into klp-devKenny Root2013-09-031-2/+14
|\ \ \ \ \ \ \
| * | | | | | | Add support for DSA and ECDSA key typesKenny Root2013-09-031-2/+14
* | | | | | | | Merge "HCE API review." into klp-devMartijn Coenen2013-09-035-8/+378
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | HCE API review.Martijn Coenen2013-08-305-8/+378
* | | | | | | | Merge "System print service enabled after every system reboot" into klp-devSvetoslav Ganov2013-09-031-1/+10
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | System print service enabled after every system rebootSvetoslav Ganov2013-09-021-1/+10
* | | | | | | | Merge "New recents behavior to match spec." into klp-devJeff Sharkey2013-09-031-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | New recents behavior to match spec.Jeff Sharkey2013-09-021-0/+9
* | | | | | | | | Merge "Refactoring of DocumentsContract." into klp-devJeff Sharkey2013-09-032-446/+534
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Refactoring of DocumentsContract.Jeff Sharkey2013-08-312-446/+534
* | | | | | | | Fix SynthesisRequest javadocPrzemyslaw Szczepaniak2013-09-021-1/+1
* | | | | | | | Merge "Improve the API document for supportsSwitchingToNextInputMethod" into ...satok2013-09-021-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve the API document for supportsSwitchingToNextInputMethodsatok2013-08-271-3/+7
* | | | | | | | | Merge "Update internal AutoScrollHelper to match support lib version" into kl...Alan Viverette2013-08-301-138/+294
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Update internal AutoScrollHelper to match support lib versionAlan Viverette2013-08-301-138/+294
* | | | | | | | | Merge "DO NOT MERGE. Remove service component for KLP." into klp-devMatthew Williams2013-08-304-356/+103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | DO NOT MERGE. Remove service component for KLP.Matthew Williams2013-08-304-356/+103
* | | | | | | | | | Merge "Update captioning APIs" into klp-devAlan Viverette2013-08-304-74/+278
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update captioning APIsAlan Viverette2013-08-294-74/+278
* | | | | | | | | | | Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." ...Jeff Hao2013-08-302-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change IsMethodTracingActive to GetMethodTracingMode for frameworks.Jeff Hao2013-08-302-4/+6
* | | | | | | | | | | | Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into k...Fabrice Di Meglio2013-08-301-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix bug #10549094 KLP API Review: android.util.LayoutDirectionFabrice Di Meglio2013-08-291-2/+6
* | | | | | | | | | | | Merge "DO NOT MERGE Printing API changes for supporting better page layout" i...Selim Gurun2013-08-303-15/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | DO NOT MERGE Printing API changes for supporting better page layoutSelim Gurun2013-08-303-15/+26
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Fix for 10530176 - CookieSyncManager must be created by WebView c'tor"...Ben Murdoch2013-08-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix for 10530176 - CookieSyncManager must be created by WebView c'torJonathan Dixon2013-08-281-0/+2
* | | | | | | | | | | | | Merge "Add debug and remove SocketTimeoutException." into klp-devWink Saville2013-08-301-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add debug and remove SocketTimeoutException.Wink Saville2013-08-291-7/+4