summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update procstats to start collecting/reporting pss.Dianne Hackborn2013-06-267-64/+465
* Move battery stats call from SystemUI to system server.John Spurlock2013-06-254-20/+160
* am 5a0f6652: am 5b3afe3a: am 4be48d43: (-s ours) Merge "Lockscreen : Referenc...Jean-Baptiste Queru2013-06-250-0/+0
|\
| * am 5b3afe3a: am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct lay...Jean-Baptiste Queru2013-06-240-0/+0
| |\
| | * am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout"Jean-Baptiste Queru2013-06-240-0/+0
| | |\
| | | * Merge "Lockscreen : Reference correct layout"Jean-Baptiste Queru2013-06-241-1/+1
| | | |\
| | | | * Lockscreen : Reference correct layoutDanesh Mondegarian2013-06-241-1/+1
* | | | | am 602bc432: am 6d324c82: am f285a709: Merge "Bug 9517413: Activity Detection...Joe Malin2013-06-251-9/+14
|\ \ \ \ \ | |/ / / /
| * | | | am 6d324c82: am f285a709: Merge "Bug 9517413: Activity Detection tutorial has...Joe Malin2013-06-241-9/+14
| |\ \ \ \
| | * \ \ \ am f285a709: Merge "Bug 9517413: Activity Detection tutorial has errors" into...Joe Malin2013-06-241-9/+14
| | |\ \ \ \
| | | * \ \ \ Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-devJoe Malin2013-06-241-9/+14
| | | |\ \ \ \
| | | | * | | | Bug 9517413: Activity Detection tutorial has errorsJoe Malin2013-06-211-9/+14
* | | | | | | | Merge "Revert "Partial CameraManager implementation""Igor Murashkin2013-06-2515-1087/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Partial CameraManager implementation"Igor Murashkin2013-06-2515-1087/+16
* | | | | | | | | Merge "Revert "Initial camera device implementation""Igor Murashkin2013-06-2526-1590/+178
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Initial camera device implementation"Igor Murashkin2013-06-2526-1590/+178
* | | | | | | | | | Merge "Make sure we have a valid EGL context before drawing Bug #9404946"Romain Guy2013-06-251-13/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure we have a valid EGL context before drawingRomain Guy2013-06-241-13/+34
* | | | | | | | | | | Merge "Use FastPrintWriter... everywhere."Dianne Hackborn2013-06-2519-53/+143
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use FastPrintWriter... everywhere.Dianne Hackborn2013-06-2419-53/+143
* | | | | | | | | | | | Merge "(Small) 9patch drawing improvements"Romain Guy2013-06-253-45/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | (Small) 9patch drawing improvementsRomain Guy2013-06-243-45/+48
* | | | | | | | | | | | Merge changes I183dd47d,I29864a5dIgor Murashkin2013-06-2536-177/+2660
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Initial camera device implementationIgor Murashkin2013-06-2426-178/+1590
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Partial CameraManager implementationIgor Murashkin2013-06-2415-16/+1087
* | | | | | | | | | | Merge "Fix FLAG_PRIVILEGED numbering"Christopher Tate2013-06-251-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix FLAG_PRIVILEGED numberingChristopher Tate2013-06-241-8/+8
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "When an app dies launch home conditionally."Craig Mautner2013-06-241-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | When an app dies launch home conditionally.Craig Mautner2013-06-241-1/+4
* | | | | | | | | | Merge "Improve FastPrintWriter."Dianne Hackborn2013-06-242-143/+201
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve FastPrintWriter.Dianne Hackborn2013-06-242-143/+201
* | | | | | | | | | | Merge "Update cleanspec."Selim Gurun2013-06-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update cleanspec.Selim Gurun2013-06-241-0/+1
* | | | | | | | | | | | Merge "Decouple recents from status bar."John Spurlock2013-06-246-162/+283
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Decouple recents from status bar.John Spurlock2013-06-246-162/+283
* | | | | | | | | | | | | Merge "Remove obsolete recents layout params."John Spurlock2013-06-243-34/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove obsolete recents layout params.John Spurlock2013-06-243-34/+0
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Fix SkASSERT errors resulting from the order objects are allocated on ...Derek Sollenberger2013-06-241-12/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix SkASSERT errors resulting from the order objects are allocatedDerek Sollenberger2013-06-241-12/+14
| |/ / / / / / / / / / /
* | | | | | | | | | | | Fix build.Craig Mautner2013-06-241-2/+2
* | | | | | | | | | | | Merge "Fix unnecessary and harmful task movement."Craig Mautner2013-06-243-11/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix unnecessary and harmful task movement.Craig Mautner2013-06-243-11/+22
* | | | | | | | | | | | | Merge "Print APIs documentation update"Svetoslav2013-06-2412-71/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Print APIs documentation updateSvetoslav2013-06-2412-71/+80
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Add activity token to display system."Craig Mautner2013-06-2416-166/+271
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add activity token to display system.Craig Mautner2013-06-2216-166/+271
* | | | | | | | | | | | | Merge "Fix wrapper equals()"Andy McFadden2013-06-246-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix wrapper equals()Andy McFadden2013-06-216-6/+4
* | | | | | | | | | | | | | Merge "Implement FastScroller as an animated overlay."Alan Viverette2013-06-244-601/+1016
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Implement FastScroller as an animated overlay.Alan Viverette2013-06-214-601/+1016