summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Update to call new Skia APIs.Leon Scroggins2014-04-0410-82/+98
* android.widget.ToolbarAdam Powell2014-04-0417-84/+1731
* Deprecate ActionBar navigation modesAdam Powell2014-04-041-0/+120
* Merge "Add android.software.managedprofiles feature flag."Adam Connors2014-04-041-1/+8
|\
| * Add android.software.managedprofiles feature flag.Adam Connors2014-04-011-1/+8
* | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-0456-8/+260
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-04-0256-8/+260
* | | Merge "Save OwnerInfo so CryptKeeper can display at boot time"Paul Lawrence2014-04-042-1/+91
|\ \ \
| * | | Save OwnerInfo so CryptKeeper can display at boot timePaul Lawrence2014-04-022-1/+91
* | | | Merge "Fix build due to bad javadoc link."Craig Mautner2014-04-041-3/+1
|\ \ \ \
| * | | | Fix build due to bad javadoc link.Craig Mautner2014-04-031-3/+1
* | | | | Merge "resolved conflicts for merge of 4f342e87 to master"Jeff Tinker2014-04-042-0/+12
|\ \ \ \ \
| * | | | | resolved conflicts for merge of 4f342e87 to masterJeff Tinker2014-04-032-0/+12
* | | | | | Merge "Add the persistable attribute for Activities"Craig Mautner2014-04-034-1/+26
|\ \ \ \ \ \
| * | | | | | Add the persistable attribute for ActivitiesCraig Mautner2014-04-034-1/+26
* | | | | | | Merge "Don't allow -1 uids for wake locks."Dianne Hackborn2014-04-031-0/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Don't allow -1 uids for wake locks.Dianne Hackborn2014-04-031-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge "Implement setActivityLabelAndIcon()."Craig Mautner2014-04-034-69/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Implement setActivityLabelAndIcon().Craig Mautner2014-03-314-69/+35
* | | | | | Merge "Move most TransformationInfo properties to RenderNode"Chris Craik2014-04-036-592/+279
|\ \ \ \ \ \
| * | | | | | Move most TransformationInfo properties to RenderNodeChris Craik2014-04-026-592/+279
* | | | | | | am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Marquee text RTL improvements"Raph Levien2014-04-031-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Marquee text RTL improvementsMichael Lekman2014-03-251-4/+4
* | | | | | | | | | am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArg...Narayan Kamath2014-04-032-5/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"Narayan Kamath2014-04-032-5/+12
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Remove ProcessState::mArgc,mArgV,mArgLenNarayan Kamath2014-04-032-5/+12
| * | | | | | | | | am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."Ben Murdoch2014-04-031-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Update ViewRootImpl for 64bit functor type."Ben Murdoch2014-04-031-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update ViewRootImpl for 64bit functor type.Ben Murdoch2014-04-021-2/+2
* | | | | | | | | | | am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamS...Jeff Brown2014-04-031-35/+39
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into...Jeff Brown2014-04-031-35/+39
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "Clean up certain state transitions in DreamService." into klp-modular-devJeff Brown2014-04-031-35/+39
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Clean up certain state transitions in DreamService.Jeff Brown2014-04-021-35/+39
| * | | | | | | | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ...Jeff Tinker2014-04-032-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modu...Jeff Tinker2014-04-032-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-022-0/+12
* | | | | | | | | | | | | | Merge "Fix dialog style, selectable item bg pinning, and pressed state"Alan Viverette2014-04-038-56/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix dialog style, selectable item bg pinning, and pressed stateAlan Viverette2014-04-028-56/+192
* | | | | | | | | | | | | | | am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" ...Jinsuk Kim2014-04-031-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modu...Jinsuk Kim2014-04-031-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Use build property for CEC device OSD nameJinsuk Kim2014-04-031-1/+0
* | | | | | | | | | | | | | | am 4c963841: am b1dca162: Merge "Maintain display power status for playback d...Jinsuk Kim2014-04-034-7/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am b1dca162: Merge "Maintain display power status for playback device" into k...Jinsuk Kim2014-04-024-7/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Maintain display power status for playback device" into klp-modular-devJinsuk Kim2014-04-024-7/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Maintain display power status for playback deviceJinsuk Kim2014-04-024-7/+20
* | | | | | | | | | | | | | Don't use TypedArray after recycling itAlan Viverette2014-04-021-2/+2
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Disable content transitions, they are not implemented yet"Alan Viverette2014-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Disable content transitions, they are not implemented yetAlan Viverette2014-04-021-1/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |