Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc | Yuichi Araki | 2015-04-02 | 1 | -3/+3 |
|\ | |||||
| * | Fix a broken link in javadoc | Yuichi Araki | 2015-04-02 | 1 | -3/+3 |
* | | Merge "Frameworks/base: Don't allocate another identity matrix" | Andreas Gampe | 2015-03-24 | 1 | -2/+1 |
|\ \ | |||||
| * | | Frameworks/base: Don't allocate another identity matrix | Andreas Gampe | 2015-03-15 | 1 | -2/+1 |
* | | | Merge "Frameworks/base: Make IDENTITY_MATRIX final" | Andreas Gampe | 2015-03-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Frameworks/base: Make IDENTITY_MATRIX final | Andreas Gampe | 2015-03-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Frameworks/base: Fix null-pointer check | Andreas Gampe | 2015-03-15 | 1 | -1/+1 |
|/ / | |||||
* | | am d002e027: Merge "Fix \'fuchsia\' typo." | Elliott Hughes | 2015-02-21 | 1 | -2/+3 |
|\ \ | |||||
| * | | Fix 'fuchsia' typo. | Elliott Hughes | 2015-02-21 | 1 | -2/+3 |
| * | | am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-l... | ztenghui | 2014-10-20 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev | Dianne Hackborn | 2014-10-08 | 3 | -4/+4 |
| |\ \ \ | |||||
| * \ \ \ | am 9f64867d: Merge "Fix theme propagation to contained android:drawable eleme... | Alan Viverette | 2014-10-02 | 9 | -10/+14 |
| |\ \ \ \ | |||||
| * \ \ \ \ | resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp | Neil Fuller | 2014-10-02 | 3 | -10/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev | ztenghui | 2014-09-30 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am b805da9b: Merge "Fix drawable container tinting" into lmp-dev | Alan Viverette | 2014-09-30 | 1 | -13/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev | Chris Craik | 2014-09-30 | 2 | -1/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am 63756956: Merge "Add callback to track and thumb drawables, propagate stat... | Alan Viverette | 2014-09-26 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTh... | Alan Viverette | 2014-09-26 | 4 | -17/+47 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev | Alan Viverette | 2014-09-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev | ztenghui | 2014-09-24 | 1 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am aa60232b: am 8518c090: Merge "Fix animation on the some properties" into l... | ztenghui | 2014-09-23 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 53dc022a: am e99510a4: Merge "Hide other color filter mutability" into lmp... | Chris Craik | 2014-09-19 | 3 | -3/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a96b8ea7: am 6a750aa9: Merge "Reduce overdraw after clearing ripples in Ri... | Alan Viverette | 2014-09-16 | 3 | -5/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 64672ef1: am 3137b288: Merge "Set cache dirty when re-create the cache bit... | ztenghui | 2014-09-16 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-m... | John Reck | 2015-01-23 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Prevent memory corruption from use-after-free | John Reck | 2015-01-23 | 1 | -2/+3 |
* | | | | | | | | | | | | | | | | | | Avoid ripple buffer creation for empty bounds automerge: b74155c | Alan Viverette | 2015-01-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Avoid ripple buffer creation for empty bounds | Alan Viverette | 2015-01-21 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-... | Alan Viverette | 2015-01-15 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Jump ripples to end when switching to a non-hardware canvas | Alan Viverette | 2015-01-14 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | | am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate,... | Alan Viverette | 2014-12-12 | 2 | -30/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming... | Alan Viverette | 2014-12-12 | 2 | -30/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Propagate DrawableContainer state on mutate, fix ColorDrawable theming | Alan Viverette | 2014-12-12 | 2 | -30/+53 |
* | | | | | | | | | | | | | | | | | | | am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when hardwa... | Alan Viverette | 2014-12-12 | 2 | -10/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Move ripple to end state on jump when hardware exit is pending | Alan Viverette | 2014-12-12 | 2 | -10/+37 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | am daec5943: Fix build | Alan Viverette | 2014-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Fix build | Alan Viverette | 2014-12-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | am 4e137437: Merge "Update tint filter after setting gradient drawable state"... | Alan Viverette | 2014-12-11 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Update tint filter after setting gradient drawable state | Alan Viverette | 2014-12-10 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | | | | am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no consta... | Alan Viverette | 2014-12-11 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Avoid creating futures for drawables with no constant state | Alan Viverette | 2014-12-10 | 1 | -1/+8 |
* | | | | | | | | | | | | | | | | | | resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp | John Reck | 2014-12-09 | 7 | -7/+79 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Teach AssetAtlas about more drawables | John Reck | 2014-12-09 | 7 | -7/+79 |
* | | | | | | | | | | | | | | | | | | 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 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 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |