Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | | am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Me... | Deepanshu Gupta | 2014-04-04 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text... | Deepanshu Gupta | 2014-04-04 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake... | Deepanshu Gupta | 2014-04-04 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | ||||||
| | | | | * | | | | | | | | | | | | | | | am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT ME... | Deepanshu Gupta | 2014-04-04 | 1 | -1/+1 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / | ||||||
| | | | | | * | | | | | | | | | | | | | | am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb... | Deepanshu Gupta | 2014-04-04 | 1 | -1/+1 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / | ||||||
| | | | | | | * | | | | | | | | | | | | | Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev | Deepanshu Gupta | 2014-04-04 | 1 | -1/+1 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | Fix text size in Fake Action Bar. [DO NOT MERGE] | Deepanshu Gupta | 2014-03-27 | 1 | -1/+1 | |
| | | | | | | | |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge "Fix build due to bad javadoc link." | Craig Mautner | 2014-04-04 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Fix build due to bad javadoc link. | Craig Mautner | 2014-04-03 | 1 | -3/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 4f342e87 to master" | Jeff Tinker | 2014-04-04 | 5 | -42/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 4f342e87 to master | Jeff Tinker | 2014-04-03 | 5 | -42/+49 | |
* | | | | | | | | | | | | | | | | | | | | | | Significant preconditions are significant | Christopher Tate | 2014-04-03 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | am 72b2f536: (-s ours) am 76c484de: am d93b0b67: am e448bcf7: Merge "Add miss... | Xavier Ducrohet | 2014-04-03 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layou... | Xavier Ducrohet | 2014-04-03 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build fi... | Xavier Ducrohet | 2014-04-03 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT ME... | Xavier Ducrohet | 2014-04-03 | 1 | -0/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into kl... | Xavier Ducrohet | 2014-04-03 | 1 | -0/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | Add missing dependency in layoutlib build file [DO NOT MERGE] | Deepanshu Gupta | 2014-03-31 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Adding activity icon to the task view" | Winson Chung | 2014-04-03 | 8 | -98/+98 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Adding activity icon to the task view | Winson Chung | 2014-04-02 | 8 | -98/+98 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add the persistable attribute for Activities" | Craig Mautner | 2014-04-03 | 5 | -1/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Add the persistable attribute for Activities | Craig Mautner | 2014-04-03 | 5 | -1/+27 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't allow -1 uids for wake locks." | Dianne Hackborn | 2014-04-03 | 2 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Don't allow -1 uids for wake locks. | Dianne Hackborn | 2014-04-03 | 2 | -0/+5 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge "Implement setActivityLabelAndIcon()." | Craig Mautner | 2014-04-03 | 7 | -94/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Implement setActivityLabelAndIcon(). | Craig Mautner | 2014-03-31 | 7 | -94/+60 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Enabled the new notification shade and improved expanding logic" | Selim Cinek | 2014-04-03 | 10 | -527/+536 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Enabled the new notification shade and improved expanding logic | Selim Cinek | 2014-04-03 | 10 | -527/+536 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge "Move most TransformationInfo properties to RenderNode" | Chris Craik | 2014-04-03 | 9 | -640/+327 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Move most TransformationInfo properties to RenderNode | Chris Craik | 2014-04-02 | 9 | -640/+327 | |
* | | | | | | | | | | | | | | | | | | | | | | am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" | Raph Levien | 2014-04-03 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" | Raph Levien | 2014-04-03 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c420ce34: Merge "Marquee text RTL improvements" | Raph Levien | 2014-04-03 | 1 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Marquee text RTL improvements" | Raph Levien | 2014-04-03 | 1 | -4/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | Marquee text RTL improvements | Michael Lekman | 2014-03-25 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArg... | Narayan Kamath | 2014-04-03 | 4 | -28/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen" | Narayan Kamath | 2014-04-03 | 4 | -28/+41 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen" | Narayan Kamath | 2014-04-03 | 4 | -28/+41 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Remove ProcessState::mArgc,mArgV,mArgLen" | Narayan Kamath | 2014-04-03 | 4 | -28/+41 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Remove ProcessState::mArgc,mArgV,mArgLen | Narayan Kamath | 2014-04-03 | 4 | -28/+41 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | am 55da6228: (-s ours) am 14424043: am 369a0057: Merge "Update ViewRootImpl f... | Ben Murdoch | 2014-04-03 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type." | Ben Murdoch | 2014-04-03 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am 369a0057: Merge "Update ViewRootImpl for 64bit functor type." | Ben Murdoch | 2014-04-03 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Update ViewRootImpl for 64bit functor type." | Ben Murdoch | 2014-04-03 | 1 | -2/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Update ViewRootImpl for 64bit functor type. | Ben Murdoch | 2014-04-02 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up on VectorDrawable." | ztenghui | 2014-04-03 | 42 | -11/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Clean up on VectorDrawable. | ztenghui | 2014-04-02 | 42 | -11/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamS... | Jeff Brown | 2014-04-03 | 1 | -35/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into... | Jeff Brown | 2014-04-03 | 1 | -35/+39 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up certain state transitions in DreamService." into klp-modular-dev | Jeff Brown | 2014-04-03 | 1 | -35/+39 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |