| Commit message (Expand) | Author | Age | Files | Lines |
* | am c1462be8: Merge "Update ripple spec, fix ripple mask, rotate progress draw... | Alan Viverette | 2014-06-04 | 3 | -27/+67 |
|\ |
|
| * | Update ripple spec, fix ripple mask, rotate progress drawable | Alan Viverette | 2014-06-04 | 3 | -27/+67 |
* | | am 8fad12dc: Merge "Fix incorrect getStringBounds (Minikin)" into lmp-preview... | Raph Levien | 2014-06-04 | 1 | -4/+5 |
|\ \
| |/ |
|
| * | Fix incorrect getStringBounds (Minikin) | Raph Levien | 2014-06-03 | 1 | -4/+5 |
* | | am aef648f4: Merge "Better Minikin integration" into lmp-preview-dev | Raph Levien | 2014-06-04 | 1 | -6/+6 |
|\ \
| |/ |
|
| * | Merge "Better Minikin integration" into lmp-preview-dev | Raph Levien | 2014-06-04 | 1 | -6/+6 |
| |\ |
|
| | * | Better Minikin integration | Raph Levien | 2014-06-03 | 1 | -6/+6 |
* | | | am 62ea9554: Merge "Temporary drawable for Quantum progress indicator" into l... | Alan Viverette | 2014-06-04 | 2 | -0/+494 |
|\ \ \
| |/ / |
|
| * | | Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev | Alan Viverette | 2014-06-04 | 2 | -0/+494 |
| |\ \ |
|
| | * | | Temporary drawable for Quantum progress indicator | Alan Viverette | 2014-06-03 | 2 | -0/+494 |
| | |/ |
|
* | | | am 15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev | Alan Viverette | 2014-06-04 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | Merge "Fix build, fix Drawable loop" into lmp-preview-dev | Alan Viverette | 2014-06-03 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Fix build, fix Drawable loop | Alan Viverette | 2014-06-03 | 1 | -1/+1 |
* | | | | Merge commit '096d52fb' into manualmerge | Alan Viverette | 2014-06-04 | 2 | -5/+5 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "Update theme colors, fix EditText state transition" into lmp-preview-dev | Alan Viverette | 2014-06-03 | 2 | -5/+5 |
| |\ \ \ |
|
| | * | | | Update theme colors, fix EditText state transition | Alan Viverette | 2014-06-03 | 2 | -5/+5 |
| | | |/
| | |/| |
|
* | | | | am a929b2d4: Merge "Set starting value on ripple exit animation" into lmp-pre... | Alan Viverette | 2014-06-04 | 1 | -0/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "Set starting value on ripple exit animation" into lmp-preview-dev | Alan Viverette | 2014-06-03 | 1 | -0/+1 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Set starting value on ripple exit animation | Alan Viverette | 2014-06-02 | 1 | -0/+1 |
| | |/ |
|
* | | | am b1c7f7f5: Merge "Fix NPE when ripples are canceled due to visibility chang... | Alan Viverette | 2014-06-04 | 1 | -1/+4 |
|\ \ \
| |/ / |
|
| * | | Fix NPE when ripples are canceled due to visibility change | Alan Viverette | 2014-06-03 | 1 | -1/+4 |
| |/ |
|
* | | Merge "Canvas JNI cleanup." | Florin Malita | 2014-06-04 | 1 | -36/+96 |
|\ \ |
|
| * | | Canvas JNI cleanup. | Florin Malita | 2014-06-04 | 1 | -36/+96 |
* | | | Merge "Ignore inPurgeable and inInputShareable." | Leon Scroggins III | 2014-06-04 | 1 | -5/+15 |
|\ \ \ |
|
| * | | | Ignore inPurgeable and inInputShareable. | Leon Scroggins III | 2014-06-03 | 1 | -5/+15 |
| |/ / |
|
* | | | Merge "Handle the alpha in the group setting and fix the fill issue." | ztenghui | 2014-06-03 | 1 | -47/+60 |
|\ \ \ |
|
| * | | | Handle the alpha in the group setting and fix the fill issue. | ztenghui | 2014-06-03 | 1 | -47/+60 |
* | | | | am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev | Alan Viverette | 2014-06-03 | 12 | -82/+28 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Merge "Clean up drawable theming APIs" into lmp-preview-dev | Alan Viverette | 2014-06-02 | 12 | -82/+28 |
| |\ \ \ |
|
| | * | | | Clean up drawable theming APIs | Alan Viverette | 2014-06-02 | 12 | -82/+28 |
* | | | | | am faa91203: Merge "Support fallbacks for custom typefaces (Minikin)" into lm... | Raph Levien | 2014-06-03 | 2 | -7/+33 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev | Raph Levien | 2014-06-02 | 2 | -7/+33 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | Support fallbacks for custom typefaces (Minikin) | Raph Levien | 2014-06-02 | 2 | -7/+33 |
* | | | | | Merge "Add the tree hierarchy for the group" | ztenghui | 2014-06-03 | 1 | -58/+175 |
|\ \ \ \ \
| | |_|/ /
| |/| | /
| |_|_|/
|/| | | |
|
| * | | | Add the tree hierarchy for the group | ztenghui | 2014-06-02 | 1 | -58/+175 |
* | | | | 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 |