summaryrefslogtreecommitdiffstats
path: root/graphics/java
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | Teach AssetAtlas about more drawablesJohn Reck2014-12-097-7/+79
* | | | | | | | | | | | | | | | | | | am c5d71c67: am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationD...Alan Viverette2014-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s on...Alan Viverette2014-12-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "Fix default value of AnimationDrawable's one shot property" into lmp-m...Alan Viverette2014-12-091-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Fix default value of AnimationDrawable's one shot propertyAlan Viverette2014-12-091-1/+1
* | | | | | | | | | | | | | | | | | | | am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagat...Alan Viverette2014-12-091-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGr...Alan Viverette2014-12-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Fix hotspot coordinate propagation in ViewGroup and AbsListViewAlan Viverette2014-12-081-0/+2
| | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator tar...ztenghui2014-12-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup whe...ztenghui2014-12-081-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-devztenghui2014-12-051-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | AVD: Deep copy the animator target setup when mutate.ztenghui2014-12-041-1/+2
* | | | | | | | | | | | | | | | | | | | am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleD...Alan Viverette2014-12-094-196/+253
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix ...Alan Viverette2014-12-084-196/+253
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Avoid extra saveLayer calls in RippleDrawable, fix docsAlan Viverette2014-12-044-196/+253
* | | | | | | | | | | | | | | | | | | | am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables...Alan Viverette2014-12-052-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am ae656af7: am bab2b594: Merge "Update locally cached drawables when constan...Alan Viverette2014-12-052-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Update locally cached drawables when constant state changesAlan Viverette2014-12-042-1/+18
* | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 203c8171 to masterJohn Reck2014-12-041-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cl...Derek Sollenberger2014-12-041-6/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.Derek Sollenberger2014-12-031-6/+1
* | | | | | | | | | | | | | | | | | | | am 42b678b3: am fa173e0c: am d72901f0: Merge "Update drawable container const...Alan Viverette2014-12-034-8/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am fa173e0c: am d72901f0: Merge "Update drawable container constant state fol...Alan Viverette2014-12-024-8/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Update drawable container constant state following cloneAlan Viverette2014-11-264-8/+28
| | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am e5684843: am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on Draw...Alan Viverette2014-11-265-37/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer...Alan Viverette2014-11-265-37/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Ensure calling mutate() on DrawableContainer creates a new stateAlan Viverette2014-11-255-37/+81
* | | | | | | | | | | | | | | | | | | am af3efb4a: am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate()...John Reck2014-11-255-75/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableC...John Reck2014-11-255-75/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new sta...John Reck2014-11-255-75/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Revert "Ensure calling mutate() on DrawableContainer creates a new state"John Reck2014-11-255-75/+35
* | | | | | | | | | | | | | | | | | | | am c9b68e11: am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values fro...Alan Viverette2014-11-251-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, ...Alan Viverette2014-11-251-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr...Alan Viverette2014-11-251-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Cannot set Pivot X,Y values from setPivotX, setPivotY APIjungheang.lee2014-11-211-4/+4
* | | | | | | | | | | | | | | | | | | | am 15913c80: am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on Draw...Alan Viverette2014-11-255-35/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer...Alan Viverette2014-11-255-35/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Ensure calling mutate() on DrawableContainer creates a new stateAlan Viverette2014-11-245-35/+75
| * | | | | | | | | | | | | | | | | | | am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NO...Chris Craik2014-11-211-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-devChris Craik2014-11-211-9/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Revert "Add a way to override Xfermode DO NOT MERGE"Chris Craik2014-11-211-9/+0
* | | | | | | | | | | | | | | | | | | | | Merge "Revert "Add a way to override Xfermode""Chris Craik2014-11-211-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Revert "Add a way to override Xfermode"Chris Craik2014-11-211-9/+0
* | | | | | | | | | | | | | | | | | | | | | am 3458abd6: am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn o...ztenghui2014-11-212-19/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the revers...ztenghui2014-11-212-19/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior now...ztenghui2014-11-202-19/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.ztenghui2014-11-202-19/+59
* | | | | | | | | | | | | | | | | | | | | | | am 0d6512a8: am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev a...Chris Craik2014-11-211-33/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-devChris Craik2014-11-211-33/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | Merge "Improve ColorMatrix docs" into lmp-mr1-devChris Craik2014-11-201-33/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |