Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | Teach AssetAtlas about more drawables | John Reck | 2014-12-09 | 7 | -7/+79 | |
* | | | | | | | | | | | | | | | | | | | am c5d71c67: am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationD... | Alan Viverette | 2014-12-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s on... | Alan Viverette | 2014-12-09 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Fix default value of AnimationDrawable's one shot property" into lmp-m... | Alan Viverette | 2014-12-09 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Fix default value of AnimationDrawable's one shot property | Alan Viverette | 2014-12-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagat... | Alan Viverette | 2014-12-09 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGr... | Alan Viverette | 2014-12-08 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Fix hotspot coordinate propagation in ViewGroup and AbsListView | Alan Viverette | 2014-12-08 | 1 | -0/+2 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator tar... | ztenghui | 2014-12-09 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup whe... | ztenghui | 2014-12-08 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev | ztenghui | 2014-12-05 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | AVD: Deep copy the animator target setup when mutate. | ztenghui | 2014-12-04 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleD... | Alan Viverette | 2014-12-09 | 4 | -196/+253 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix ... | Alan Viverette | 2014-12-08 | 4 | -196/+253 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Avoid extra saveLayer calls in RippleDrawable, fix docs | Alan Viverette | 2014-12-04 | 4 | -196/+253 | |
* | | | | | | | | | | | | | | | | | | | | am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables... | Alan Viverette | 2014-12-05 | 2 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am ae656af7: am bab2b594: Merge "Update locally cached drawables when constan... | Alan Viverette | 2014-12-05 | 2 | -1/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Update locally cached drawables when constant state changes | Alan Viverette | 2014-12-04 | 2 | -1/+18 | |
* | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 203c8171 to master | John Reck | 2014-12-04 | 1 | -6/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cl... | Derek Sollenberger | 2014-12-04 | 1 | -6/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Update AndroidPixelRef to prevent VM from cleaning up memory prematurely. | Derek Sollenberger | 2014-12-03 | 1 | -6/+1 | |
* | | | | | | | | | | | | | | | | | | | | am 42b678b3: am fa173e0c: am d72901f0: Merge "Update drawable container const... | Alan Viverette | 2014-12-03 | 4 | -8/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am fa173e0c: am d72901f0: Merge "Update drawable container constant state fol... | Alan Viverette | 2014-12-02 | 4 | -8/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Update drawable container constant state following clone | Alan Viverette | 2014-11-26 | 4 | -8/+28 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | am e5684843: am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on Draw... | Alan Viverette | 2014-11-26 | 5 | -37/+81 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer... | Alan Viverette | 2014-11-26 | 5 | -37/+81 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Ensure calling mutate() on DrawableContainer creates a new state | Alan Viverette | 2014-11-25 | 5 | -37/+81 | |
* | | | | | | | | | | | | | | | | | | | am af3efb4a: am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate()... | John Reck | 2014-11-25 | 5 | -75/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableC... | John Reck | 2014-11-25 | 5 | -75/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new sta... | John Reck | 2014-11-25 | 5 | -75/+35 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Revert "Ensure calling mutate() on DrawableContainer creates a new state" | John Reck | 2014-11-25 | 5 | -75/+35 | |
* | | | | | | | | | | | | | | | | | | | | am c9b68e11: am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values fro... | Alan Viverette | 2014-11-25 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, ... | Alan Viverette | 2014-11-25 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr... | Alan Viverette | 2014-11-25 | 1 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | Cannot set Pivot X,Y values from setPivotX, setPivotY API | jungheang.lee | 2014-11-21 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | | | am 15913c80: am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on Draw... | Alan Viverette | 2014-11-25 | 5 | -35/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer... | Alan Viverette | 2014-11-25 | 5 | -35/+75 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Ensure calling mutate() on DrawableContainer creates a new state | Alan Viverette | 2014-11-24 | 5 | -35/+75 | |
| * | | | | | | | | | | | | | | | | | | | am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NO... | Chris Craik | 2014-11-21 | 1 | -9/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev | Chris Craik | 2014-11-21 | 1 | -9/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Revert "Add a way to override Xfermode DO NOT MERGE" | Chris Craik | 2014-11-21 | 1 | -9/+0 | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Add a way to override Xfermode"" | Chris Craik | 2014-11-21 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Revert "Add a way to override Xfermode" | Chris Craik | 2014-11-21 | 1 | -9/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | am 3458abd6: am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn o... | ztenghui | 2014-11-21 | 2 | -19/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the revers... | ztenghui | 2014-11-21 | 2 | -19/+59 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior now... | ztenghui | 2014-11-20 | 2 | -19/+59 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | ASLD: ASLD's XML reversible flag can turn off the reverse behavior now. | ztenghui | 2014-11-20 | 2 | -19/+59 | |
* | | | | | | | | | | | | | | | | | | | | | | | am 0d6512a8: am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev a... | Chris Craik | 2014-11-21 | 1 | -33/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev | Chris Craik | 2014-11-21 | 1 | -33/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Improve ColorMatrix docs" into lmp-mr1-dev | Chris Craik | 2014-11-20 | 1 | -33/+61 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |