summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* More work on voice interaction visuals.Dianne Hackborn2014-05-302-8/+74
* Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp...Christopher Tate2014-05-292-28/+48
|\
| * DO NOT MERGE Implementation of TaskManager reschedule/cancelMatthew Williams2014-05-292-28/+48
* | Moved shared element motion to be in called Activity.George Mount2014-05-293-237/+354
* | DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtenderGriff Hazen2014-05-281-4/+6
|/
* Toolbar factoring and ActionBar functionality integrationAdam Powell2014-05-281-0/+2
* Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-previ...Christopher Tate2014-05-288-5/+598
|\
| * DO NOT MERGE - Run the task manager service at startupChristopher Tate2014-05-238-5/+598
* | Merge "DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExten...Griff Hazen2014-05-281-0/+8
|\ \
| * | DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtenderGriff Hazen2014-05-271-0/+8
* | | Merge "Use activity transitions when launched from fragments." into lmp-previ...George Mount2014-05-281-1/+8
|\ \ \
| * | | Use activity transitions when launched from fragments.George Mount2014-05-231-1/+8
| | |/ | |/|
* | | Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-previ...George Mount2014-05-283-8/+6
|\ \ \ | |_|/ |/| |
| * | fixed mIsReturning initialized too late. DO NOT MERGE.George Mount2014-05-233-8/+6
| |/
* | DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtenderGriff Hazen2014-05-271-19/+44
* | Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notif...Griff Hazen2014-05-284-918/+776
|\ \
| * | DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notificationsGriff Hazen2014-05-254-918/+776
| |/
* | DO NOT MERGEWinson Chung2014-05-271-2/+2
|/
* Create deviceowner gated APIs for creating and removing users in devicepolicy...Julia Reynolds2014-05-232-0/+42
* Merge "Make the EthernetManager available."Lorenzo Colitti2014-05-221-0/+9
|\
| * Make the EthernetManager available.Lorenzo Colitti2014-05-211-0/+9
* | Introducing Notification.MediaStyle.Dan Sandler2014-05-221-2/+151
* | Added Notification.EXTRA_BACKGROUND_IMAGE_URIJose Lima2014-05-211-0/+11
* | Revert "Hide voice interaction APIs."Dianne Hackborn2014-05-212-3/+0
* | Simplify NotificationListenerService APIChristoph Studer2014-05-211-2/+4
* | Merge "Fixed inverse of listener assignment."George Mount2014-05-211-1/+1
|\ \
| * | Fixed inverse of listener assignment.George Mount2014-05-211-1/+1
* | | Merge "Change method name per API council request"Craig Mautner2014-05-212-4/+4
|\ \ \
| * | | Change method name per API council requestCraig Mautner2014-05-192-4/+4
* | | | Merge "Connect user audio restrictions to app ops."Emily Bernier2014-05-211-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Connect user audio restrictions to app ops.Emily Bernier2014-05-161-7/+7
* | | | Merge changes I2da66b54,I8a65428dGeorge Mount2014-05-215-49/+104
|\ \ \ \
| * | | | Fix for quick "back" in Activity Transitions.George Mount2014-05-204-25/+50
| * | | | Enter and exit transitions are inverted in calling Activity.George Mount2014-05-203-24/+54
* | | | | Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE."Sander Alewijnse2014-05-211-5/+4
|\ \ \ \ \
| * | | | | Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE.Sander Alewijnse2014-05-201-5/+4
* | | | | | Merge "Hotspot 2.0 framework - add implementation"Yuhao Zheng2014-05-211-4/+4
|\ \ \ \ \ \
| * | | | | | Hotspot 2.0 framework - add implementationRoger Chang2014-05-201-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-...Griff Hazen2014-05-212-28/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-devGriff Hazen2014-05-212-28/+32
| |\ \ \ \ \
| | * | | | | Fixes to WearableActionExtensionsGriff Hazen2014-05-202-28/+32
* | | | | | | Merge "resolved conflicts for merge of cbe69ec1 to master"Griff Hazen2014-05-202-0/+874
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of cbe69ec1 to masterGriff Hazen2014-05-202-0/+874
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 7ea18e1c: Add wearable notification extensions to frameworks/base.Griff Hazen2014-05-202-0/+874
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Add wearable notification extensions to frameworks/base.Griff Hazen2014-05-202-0/+874
* | | | | | | | Merge "Pass along the appOp param to broadcastIntent"Amith Yamasani2014-05-201-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Pass along the appOp param to broadcastIntentAmith Yamasani2014-05-201-1/+1
* | | | | | | | Merge "Add Device/Profile Owner gated apis for setting/getting blocked packag...Julia Reynolds2014-05-202-0/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Device/Profile Owner gated apis for setting/getting blocked packages.Julia Reynolds2014-05-202-0/+66
* | | | | | | | | Merge "Allow device/profile owners to update settings."Julia Reynolds2014-05-202-0/+42
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |