summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-...Griff Hazen2014-05-211-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-devGriff Hazen2014-05-211-5/+5
| |\ \ \ \ \
| | * | | | | Fixes to WearableActionExtensionsGriff Hazen2014-05-201-5/+5
* | | | | | | Merge "resolved conflicts for merge of cbe69ec1 to master"Griff Hazen2014-05-201-0/+74
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of cbe69ec1 to masterGriff Hazen2014-05-201-0/+74
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | |
| | * | | | | am 7ea18e1c: Add wearable notification extensions to frameworks/base.Griff Hazen2014-05-201-0/+74
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Add wearable notification extensions to frameworks/base.Griff Hazen2014-05-201-0/+74
* | | | | | | Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class.""Andres Morales2014-05-201-6/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Adding INfcUnlockSettings and NfcUnlock interface class."Andres Morales2014-05-201-6/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Clean up Outline API, method on drawable"Chris Craik2014-05-201-2/+2
|\ \ \ \ \ \
| * | | | | | Clean up Outline API, method on drawableChris Craik2014-05-201-2/+2
* | | | | | | Merge "Update FingerprintManager API after discussions."Jim Miller2014-05-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update FingerprintManager API after discussions.Jim Miller2014-05-191-1/+1
* | | | | | | | Merge "Per-user telephony restrictions"Amith Yamasani2014-05-201-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Per-user telephony restrictionsAmith Yamasani2014-05-201-0/+1
* | | | | | | | | Merge "Add Device/Profile Owner gated apis for setting/getting blocked packag...Julia Reynolds2014-05-201-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Device/Profile Owner gated apis for setting/getting blocked packages.Julia Reynolds2014-05-201-0/+3
* | | | | | | | | | Merge "Allow device/profile owners to update settings."Julia Reynolds2014-05-201-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow device/profile owners to update settings.Julia Reynolds2014-05-201-0/+2
| |/ / / / / / / /
* | | | | | | | | Merge "Add getMediaSession to RCC"RoboErik2014-05-201-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add getMediaSession to RCCRoboErik2014-05-201-0/+1
* | | | | | | | | | resolved conflicts for merge of 8f1e7ade to masterGriff Hazen2014-05-201-1/+44
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api.Griff Hazen2014-05-201-1/+44
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Add RemoteInput, Grouping, and Extender to Notification api.Griff Hazen2014-05-201-1/+44
* | | | | | | | | Merge "USB: Minor cleanup from API council review"Mike Lockwood2014-05-201-3/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | USB: Minor cleanup from API council reviewMike Lockwood2014-05-201-3/+2
* | | | | | | | | | resolved conflicts for merge of ecf09321 to masterBen Murdoch2014-05-201-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into ...Ben Murdoch2014-05-201-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Add PackagManager flag for WebView system feature.Ben Murdoch2014-05-191-0/+1
* | | | | | | | | | Revert "Various API council fixes to drawables"Alan Viverette2014-05-201-0/+10
* | | | | | | | | | Merge "Various API council fixes to drawables"Alan Viverette2014-05-201-10/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Various API council fixes to drawablesAlan Viverette2014-05-201-10/+1
* | | | | | | | | | Add ZEN and speedbump to NotificationListenerServiceChristoph Studer2014-05-201-4/+8
* | | | | | | | | | Merge "Add to activity transition API as requested by consumers."George Mount2014-05-201-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add to activity transition API as requested by consumers.George Mount2014-05-201-3/+3
* | | | | | | | | | | Merge "API Review: split out BidirectionalTypeConverter."George Mount2014-05-201-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | API Review: split out BidirectionalTypeConverter.George Mount2014-05-191-1/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost an...Wei Wang2014-05-191-0/+174
* | | | | | | | | | | Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multip...Wei Wang2014-05-201-174/+0
* | | | | | | | | | | APIs for BLE scan, scan filter, batch scan, onFound/onLost and multipleWei Wang2014-05-191-0/+174
* | | | | | | | | | | Merge "Move the non-market install setting from Global to per-user Secure"Christopher Tate2014-05-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move the non-market install setting from Global to per-user SecureChristopher Tate2014-05-191-2/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | New keycode definitions for HDMI-CECJinsuk Kim2014-05-201-0/+6
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | TouchFeedbackDrawable is now RippleDrawableAlan Viverette2014-05-191-35/+9
* | | | | | | | | | Merge "Add HEVC decoder support ot MediaCodec bug: 14571712"Rachad2014-05-191-0/+28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add HEVC decoder support ot MediaCodecRachad2014-05-141-0/+28
* | | | | | | | | | Merge "Rename session classes to have media prefix, hide routes"RoboErik2014-05-191-239/+83
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Rename session classes to have media prefix, hide routesRoboErik2014-05-161-239/+83
* | | | | | | | | | Add javadoc and unhide new APIRobert Greenwalt2014-05-191-7/+43
* | | | | | | | | | Add docs for Linkproperties and unhide it.Robert Greenwalt2014-05-191-0/+32
| |_|_|_|_|_|_|/ / |/| | | | | | | |