summaryrefslogtreecommitdiffstats
path: root/graphics/java
Commit message (Collapse)AuthorAgeFilesLines
* Fix 'fuchsia' typo.Elliott Hughes2015-02-211-2/+3
| | | | | Bug: https://code.google.com/p/android/issues/detail?id=152142 Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
* am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using ↵ztenghui2014-10-201-0/+1
|\ | | | | | | | | | | | | bi-linear filter." into lmp-dev * commit '877ce2c42b5d423719246f5458cd66fa9fddb317': Make sure the bitmap from VD's cache is drawn using bi-linear filter.
| * Make sure the bitmap from VD's cache is drawn using bi-linear filter.ztenghui2014-10-161-0/+1
| | | | | | | | | | | | b/17949291 Change-Id: I0e59852220ab8a3be2c70afa483e805029a9e19e
* | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-083-4/+4
|\ \ | |/ | | | | | | * commit '89b196958fee07475765bd3c458098464ba16f2e': Put in real "code" (aka marketing) name.
| * Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-073-4/+4
| | | | | | | | Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
* | am 9f64867d: Merge "Fix theme propagation to contained android:drawable ↵Alan Viverette2014-10-029-10/+14
|\ \ | |/ | | | | | | | | | | elements" into lmp-dev * commit '9f64867da107b772b867876ddf979d1a3ec19192': Fix theme propagation to contained android:drawable elements
| * Fix theme propagation to contained android:drawable elementsAlan Viverette2014-10-029-10/+14
| | | | | | | | | | BUG: 17790666 Change-Id: I6733a98e779cad0d384b917c57d2b3409a166c02
* | resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-023-10/+6
|\ \ | | | | | | | | | Change-Id: I97671e62de26919e391dbb2686511584c59ab990
| * | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-013-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation is an API change: FloatMath is going to be deprecated and/or removed. Performance is not the goal of this change. That said... Math is faster than FloatMath with AOT compilation. While making the change, occurances of: {Float}Math.sqrt(x * x + y * y) and {Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2)) have been replaced with: {(float)} Math.hypot(x, y) Right now there is no runtime intrinsic for hypot so is not faster in all cases for AOT compilation: Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with AOT, but all other combinations of FloatMath, use of pow() etc. are slower than hypot(). hypot() has the advantage of being self documenting and could be optimized in future. None of the behavior differences around NaN and rounding appear to be important for the cases looked at: they all assume results and arguments are in range and usually the results are cast to float. Different implementations measured on hammerhead / L: AOT compiled: [FloatMath.hypot(x, y)] benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials [FloatMath.sqrt(x*x + y*y)] benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials [FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))] benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials [(float) Math.hypot(x, y)] benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials [(float) Math.sqrt(x*x + y*y)] benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials [(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))] benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials Interpreter: benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I06c91f682095e627cb547d60d936ef87941be692
* | | am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-devztenghui2014-09-301-0/+6
|\ \ \ | | |/ | |/| | | | | | | * commit 'ffa16f944882f2e27109af8fe4b7272322f9cb84': Correct the documentation for VectorDrawable
| * | Correct the documentation for VectorDrawableztenghui2014-09-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We missed the alpha for the vector drawable root level in the documentation. And the animation target can be vector drawable itself for the alpha value, which is more than path and group object. b/17696183 Change-Id: Ic9d441fbdf411dad92718ae5adbc6655fe708453
* | | am b805da9b: Merge "Fix drawable container tinting" into lmp-devAlan Viverette2014-09-301-13/+18
|\ \ \ | |/ / | | | | | | | | | * commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7': Fix drawable container tinting
| * | Merge "Fix drawable container tinting" into lmp-devAlan Viverette2014-09-301-13/+18
| |\ \
| | * | Fix drawable container tintingAlan Viverette2014-09-291-13/+18
| | | | | | | | | | | | | | | | | | | | BUG: 17704311 Change-Id: Ib9ced41e8589352c852e6c9dc7abbe6e4b9f2520
* | | | am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-devChris Craik2014-09-302-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e910cc88387f49b119bb2f8e579849864970ac87': Implement alpha as documented for drawables
| * | | Implement alpha as documented for drawablesChris Craik2014-09-292-1/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17693526 With this change, outline opacity isn't published by default, as was intended. Default behavior for custom drawables is to have a rectangular outline, but not cast a shadow, e.g. as a button background. Change-Id: If80a256ff359bcb58f3f593ec9018f2df5fc4e44
* | | am 63756956: Merge "Add callback to track and thumb drawables, propagate ↵Alan Viverette2014-09-261-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | state in ASLD" into lmp-dev * commit '637569566d2234b06e08d94acf4db1b0d3be6501': Add callback to track and thumb drawables, propagate state in ASLD
| * | Add callback to track and thumb drawables, propagate state in ASLDAlan Viverette2014-09-261-2/+7
| | | | | | | | | | | | | | | BUG: 17665424 Change-Id: I22da4530f3e2869d856102e804f020461a46fe49
* | | am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix ↵Alan Viverette2014-09-264-17/+47
|\ \ \ | |/ / | | | | | | | | | | | | | | | applyTheme in VD" into lmp-dev * commit '81e2f789029701b569d3c0deee8bc74fbebab5db': Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
| * | Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VDAlan Viverette2014-09-264-17/+47
| | | | | | | | | | | | | | | BUG: 17646144 Change-Id: I58c111d86224dc8f7f557073c0bcbc22ad74aa1b
* | | am 21662c96: Merge "Cut ripple background alpha in half" into lmp-devAlan Viverette2014-09-251-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '21662c96fa9d107a60f4ce98f7179264c972b142': Cut ripple background alpha in half
| * | Merge "Cut ripple background alpha in half" into lmp-devAlan Viverette2014-09-251-1/+1
| |\ \
| | * | Cut ripple background alpha in halfAlan Viverette2014-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ripple alpha is supposed to be split evenly between the foreground ripple layer and the background layer, but the background alpha wasn't getting adjusted properly. BUG: 17658817 Change-Id: I7af2f2ed38400a40d4a17da020363c7ae5c71a7b
* | | | am c793e67c: Merge "Fix AVD for CTS failure." into lmp-devztenghui2014-09-241-2/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84': Fix AVD for CTS failure.
| * | | Merge "Fix AVD for CTS failure." into lmp-devztenghui2014-09-241-2/+9
| |\ \ \
| | * | | Fix AVD for CTS failure.ztenghui2014-09-231-2/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly about changingConfig flags, the fix is just a copy from VectorDrawable. b/17631551 Change-Id: Ibad9c2f61cd86b15e9bca1d1991c8cd147897bb0
* | | | am aa60232b: am 8518c090: Merge "Fix animation on the some properties" into ↵ztenghui2014-09-231-8/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'aa60232b96ace3ab176611c170e950a7b6db5481': Fix animation on the some properties
| * | | Fix animation on the some propertiesztenghui2014-09-231-8/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The risk is low since most of them are just matching the naming to xml. And this update won't cause build breakage. b/17623982 Change-Id: I1eda0b8314ec7b94bc03976cdc365a7dc1039f4c
* | | am 53dc022a: am e99510a4: Merge "Hide other color filter mutability" into ↵Chris Craik2014-09-193-3/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-dev * commit '53dc022a6c12c1b916583dc8aee92cb63c7f73f5': Hide other color filter mutability
| * | Hide other color filter mutabilityChris Craik2014-09-193-3/+18
| | | | | | | | | | | | | | | bug:17262092 Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
* | | am a96b8ea7: am 6a750aa9: Merge "Reduce overdraw after clearing ripples in ↵Alan Viverette2014-09-163-5/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | RippleDrawable" into lmp-dev * commit 'a96b8ea7fe489965b7381b59169dd20fd46d334c': Reduce overdraw after clearing ripples in RippleDrawable
| * | Merge "Reduce overdraw after clearing ripples in RippleDrawable" into lmp-devAlan Viverette2014-09-163-5/+30
| |\ \
| | * | Reduce overdraw after clearing ripples in RippleDrawableAlan Viverette2014-09-153-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only need to force a transparent draw after canceling a render thread accelerated animation, and then we can draw again without the transparency to avoid overdraw in the display list. BUG: 17451761 Change-Id: I640f9a29d0940a93802f14a15f27d2c2072755ce
* | | | am 64672ef1: am 3137b288: Merge "Set cache dirty when re-create the cache ↵ztenghui2014-09-161-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | bitmap" into lmp-dev * commit '64672ef149fa48afcf7f5f4b2ed0f96386b6d368': Set cache dirty when re-create the cache bitmap
| * | | Set cache dirty when re-create the cache bitmapztenghui2014-09-151-0/+1
| |/ / | | | | | | | | | | | | b/17503595 Change-Id: Icdaa3651345b740772363f8afb29bb36741fcc87
* | | am 3512e8d6: am 1e8bb662: Merge "Apply VectorDrawable color filter at draw ↵Alan Viverette2014-09-131-75/+40
|\ \ \ | |/ / | | | | | | | | | | | | | | | time" into lmp-dev * commit '3512e8d63d5ea422876661a38d01766d15cbf096': Apply VectorDrawable color filter at draw time
| * | Merge "Apply VectorDrawable color filter at draw time" into lmp-devAlan Viverette2014-09-121-75/+40
| |\ \
| | * | Apply VectorDrawable color filter at draw timeAlan Viverette2014-09-121-75/+40
| | | | | | | | | | | | | | | | | | | | BUG: 17491152 Change-Id: Ia0ca0bd7cd00363ad5777d3e2e62fa1131a6d8a5
* | | | am 2b4de8b4: am f559f89c: Merge "Report button opacity for current state, ↵Alan Viverette2014-09-131-19/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | fix button shadows" into lmp-dev * commit '2b4de8b4ee417695cdc88e9aef0aded47036e8ef': Report button opacity for current state, fix button shadows
| * | | Merge "Report button opacity for current state, fix button shadows" into lmp-devAlan Viverette2014-09-121-19/+19
| |\ \ \ | | |/ / | |/| |
| | * | Report button opacity for current state, fix button shadowsAlan Viverette2014-09-121-19/+19
| | | | | | | | | | | | | | | | | | | | BUG: 17433604 Change-Id: I25e0bd9b96e09ed2a4d85476b60f459e7cc33002
* | | | am 8207e209: am 2bb77b5a: Merge "Add root alpha and animation to ↵ztenghui2014-09-121-19/+90
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | (Animated)VectorDrawable" into lmp-dev * commit '8207e209ade72f13a1ed77f5bc219163385a28af': Add root alpha and animation to (Animated)VectorDrawable
| * | | Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-devztenghui2014-09-121-19/+90
| |\ \ \ | | |/ / | |/| |
| | * | Add root alpha and animation to (Animated)VectorDrawableztenghui2014-09-121-19/+90
| | | | | | | | | | | | | | | | | | | | | | | | b/17393626 Change-Id: If6a28b072f7d4bcb2b57022d86ec784f4c0d78f1
* | | | am 5dee9c9b: am 855fc8c7: Update icons to vectors, fix preload theming & ↵Alan Viverette2014-09-127-31/+89
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | vector tinting * commit '5dee9c9b3e68e7567e765b7abb5ba3d3f05ce989': Update icons to vectors, fix preload theming & vector tinting
| * | | Update icons to vectors, fix preload theming & vector tintingAlan Viverette2014-09-127-31/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a missing JNI binding to AssetManager, ensures drawables have default tint modes as documented, and updates vector tint appropriately when state changes. BUG: 17385604 Change-Id: Ice92885989ebc13b95952f5dc3b7904cc956da12
* | | | am 7768b45e: am f23dcf73: Merge "Unfilled shapes should not report ↵Chet Haase2014-09-121-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | themselves as opaque" into lmp-dev * commit '7768b45e8e49a87709f752ed1a3f67616b70f76a': Unfilled shapes should not report themselves as opaque
| * | | Merge "Unfilled shapes should not report themselves as opaque" into lmp-devChet Haase2014-09-121-0/+5
| |\ \ \
| | * | | Unfilled shapes should not report themselves as opaqueChet Haase2014-09-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #17470611 Stroked, unfilled GradientDrawable shouldn't cast a shadow Change-Id: Ied60e12c2d2567efec8dac1fe69c77b49ef25b8e
* | | | | am d6ec00a6: am f1101afa: Merge "Fix null rect parameter for saveLayer / ↵Chris Craik2014-09-121-15/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | saveLayerAlpha" into lmp-dev * commit 'd6ec00a609c31d40493bfa15314763ec8937f09d': Fix null rect parameter for saveLayer / saveLayerAlpha