| Commit message (Expand) | Author | Age | Files | Lines |
* | am 73d37038: Merge "Fix null paint in GradientDrawable, make default values e... | Alan Viverette | 2014-06-02 | 1 | -8/+10 |
|\ |
|
| * | Merge "Fix null paint in GradientDrawable, make default values explicit" into... | Alan Viverette | 2014-06-02 | 1 | -8/+10 |
| |\ |
|
| | * | Fix null paint in GradientDrawable, make default values explicit | Alan Viverette | 2014-06-01 | 1 | -8/+10 |
* | | | Merge "Add a native Canvas wrapper." | Florin Malita | 2014-06-02 | 4 | -85/+80 |
|\ \ \ |
|
| * | | | Add a native Canvas wrapper. | Florin Malita | 2014-05-30 | 4 | -85/+80 |
* | | | | am cc179e25: Merge "Allow ripple bounds to change during enter animation" int... | Alan Viverette | 2014-06-02 | 2 | -134/+135 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Allow ripple bounds to change during enter animation | Alan Viverette | 2014-06-01 | 2 | -134/+135 |
| | |/
| |/| |
|
* | | | am 8709eeb9: Merge "Fix padding for GradientDrawable" into lmp-preview-dev | Alan Viverette | 2014-06-01 | 1 | -3/+6 |
|\ \ \
| |/ / |
|
| * | | Merge "Fix padding for GradientDrawable" into lmp-preview-dev | Alan Viverette | 2014-06-01 | 1 | -3/+6 |
| |\ \ |
|
| | * | | Fix padding for GradientDrawable | Alan Viverette | 2014-06-01 | 1 | -3/+6 |
* | | | | Merge commit '6682183b' into manualmerge | Alan Viverette | 2014-06-01 | 3 | -275/+353 |
|\ \ \ \
| |/ / / |
|
| * | | | Fixes hotspot list transitions, update to use a single hotspot | Alan Viverette | 2014-06-01 | 3 | -275/+353 |
| |/ / |
|
* | | | am 953fe800: Merge "Language and variant selection for Minikin" into lmp-prev... | Raph Levien | 2014-05-29 | 3 | -6/+31 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | Language and variant selection for Minikin | Raph Levien | 2014-05-29 | 3 | -6/+31 |
| * | Layoutlib fixes for L [DO NOT MERGE] | Deepanshu Gupta | 2014-05-27 | 2 | -4/+20 |
| * | Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev | ztenghui | 2014-05-27 | 1 | -0/+1 |
| |\ |
|
| | * | DO NOT MERGE: Hide the VectorDrawable | ztenghui | 2014-05-23 | 1 | -0/+1 |
| * | | Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-previe... | Chris Craik | 2014-05-23 | 6 | -49/+4 |
| |\ \ |
|
| | * | | DO NOT MERGE Inspect SkShader to determine hw shader. | Leon Scroggins III | 2014-05-23 | 6 | -49/+4 |
* | | | | Merge "Add translation and scale to the group tag and related tests." | ztenghui | 2014-05-28 | 1 | -8/+48 |
|\ \ \ \ |
|
| * | | | | Add translation and scale to the group tag and related tests. | ztenghui | 2014-05-28 | 1 | -8/+48 |
* | | | | | Cleanup Canvas API by deprecating a few methods. | Derek Sollenberger | 2014-05-28 | 1 | -0/+6 |
|/ / / / |
|
* | | | | Move the rotation information from path to group. | ztenghui | 2014-05-28 | 1 | -139/+116 |
* | | | | Merge "Layoutlib fixes for L" | Deepanshu Gupta | 2014-05-27 | 2 | -4/+20 |
|\ \ \ \ |
|
| * | | | | Layoutlib fixes for L | Deepanshu Gupta | 2014-05-22 | 2 | -4/+20 |
| | |/ /
| |/| | |
|
* | | | | Merge "Bring the group tag back to VectorDrawable." | ztenghui | 2014-05-27 | 1 | -16/+34 |
|\ \ \ \ |
|
| * | | | | Bring the group tag back to VectorDrawable. | ztenghui | 2014-05-27 | 1 | -16/+34 |
* | | | | | am a8b23365: Merge "Add support for setColorFilter in VectorDrawable" into lm... | Alan Viverette | 2014-05-23 | 1 | -15/+41 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Merge "Add support for setColorFilter in VectorDrawable" into lmp-preview-dev | Alan Viverette | 2014-05-23 | 1 | -15/+41 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Add support for setColorFilter in VectorDrawable | Alan Viverette | 2014-05-23 | 1 | -15/+41 |
| | | |/
| | |/| |
|
| * | | | DO NOT MERGE Fix build. | Alan Viverette | 2014-05-23 | 1 | -0/+3 |
* | | | | Merge "Fix build." | Alan Viverette | 2014-05-23 | 1 | -0/+3 |
|\ \ \ \ |
|
| * | | | | Fix build. | Alan Viverette | 2014-05-23 | 1 | -0/+3 |
| | |/ /
| |/| | |
|
* | | | | am e11794a2: Merge "Update switch, checkbox, radio button, button, and toggle... | Alan Viverette | 2014-05-23 | 3 | -6/+51 |
|\ \ \ \
| | |/ /
| |/| /
| |_|/
|/| | |
|
| * | | Update switch, checkbox, radio button, button, and toggle button | Alan Viverette | 2014-05-22 | 3 | -6/+51 |
| |/ |
|
* | | Merge "Inspect SkShader to determine hw shader." | Chris Craik | 2014-05-23 | 6 | -49/+4 |
|\ \
| |/
|/| |
|
| * | Inspect SkShader to determine hw shader. | Leon Scroggins III | 2014-05-22 | 6 | -49/+4 |
* | | Move setTint into Drawable, unhide getDirtyBounds on Drawable | Alan Viverette | 2014-05-21 | 4 | -107/+58 |
* | | Merge "Style and asset cleanup" | Alan Viverette | 2014-05-22 | 1 | -1/+2 |
|\ \ |
|
| * | | Style and asset cleanup | Alan Viverette | 2014-05-21 | 1 | -1/+2 |
* | | | Merge "Define light position (using new lighting spec) in Java" | Chris Craik | 2014-05-22 | 1 | -2/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Define light position (using new lighting spec) in Java | Chris Craik | 2014-05-21 | 1 | -2/+6 |
* | | | Merge "Clean up hotspot bounds API" | Alan Viverette | 2014-05-21 | 5 | -4/+22 |
|\ \ \ |
|
| * | | | Clean up hotspot bounds API | Alan Viverette | 2014-05-21 | 5 | -4/+22 |
* | | | | Merge "Clean up Gradient drawable theming & whitespace" | Alan Viverette | 2014-05-21 | 1 | -237/+187 |
|\ \ \ \
| |/ / / |
|
| * | | | Clean up Gradient drawable theming & whitespace | Alan Viverette | 2014-05-21 | 1 | -237/+187 |
* | | | | Addressing APIs council feedback | Svetoslav | 2014-05-21 | 1 | -37/+42 |
|/ / / |
|
* | | | Merge "Clean up Outline API, method on drawable" | Chris Craik | 2014-05-20 | 2 | -15/+28 |
|\ \ \ |
|
| * | | | Clean up Outline API, method on drawable | Chris Craik | 2014-05-20 | 2 | -15/+28 |
| |/ / |
|
* | | | Various API review fixes to resources and drawables | Alan Viverette | 2014-05-20 | 1 | -6/+5 |