2151 Commits

Author SHA1 Message Date
ztenghui
b12ff84159 am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev
* commit '877ce2c42b5d423719246f5458cd66fa9fddb317':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
2014-10-20 20:36:34 +00:00
ztenghui
eec6164e6f Make sure the bitmap from VD's cache is drawn using bi-linear filter.
b/17949291

Change-Id: I0e59852220ab8a3be2c70afa483e805029a9e19e
2014-10-16 15:40:04 -07:00
Dianne Hackborn
529b78941c am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
2014-10-08 22:48:44 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name.
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
2014-10-07 20:17:19 -07:00
Alan Viverette
b4e8077b52 am 9f64867d: Merge "Fix theme propagation to contained android:drawable elements" into lmp-dev
* commit '9f64867da107b772b867876ddf979d1a3ec19192':
  Fix theme propagation to contained android:drawable elements
2014-10-02 23:41:44 +00:00
Alan Viverette
39e33621a7 Fix theme propagation to contained android:drawable elements
BUG: 17790666
Change-Id: I6733a98e779cad0d384b917c57d2b3409a166c02
2014-10-02 15:54:23 -07:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
2014-10-02 11:48:08 +01:00
Neil Fuller
33253a4baa Switch from FloatMath -> Math and Math.hypot where possible
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
2014-10-01 14:04:15 +01:00
ztenghui
bb2391929c am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-dev
* commit 'ffa16f944882f2e27109af8fe4b7272322f9cb84':
  Correct the documentation for VectorDrawable
2014-09-30 22:09:22 +00:00
ztenghui
c3fdffa981 Correct the documentation for VectorDrawable
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
2014-09-30 15:02:24 -07:00
Alan Viverette
d11215b8bb am b805da9b: Merge "Fix drawable container tinting" into lmp-dev
* commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7':
  Fix drawable container tinting
2014-09-30 14:55:36 +00:00
Chris Craik
75533864ac am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev
* commit 'e910cc88387f49b119bb2f8e579849864970ac87':
  Implement alpha as documented for drawables
2014-09-30 14:55:26 +00:00
Alan Viverette
b805da9b59 Merge "Fix drawable container tinting" into lmp-dev 2014-09-30 00:32:30 +00:00
Alan Viverette
bddb843e79 Fix drawable container tinting
BUG: 17704311
Change-Id: Ib9ced41e8589352c852e6c9dc7abbe6e4b9f2520
2014-09-29 17:22:47 -07:00
Chris Craik
3f873d8644 Implement alpha as documented for drawables
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
2014-09-29 21:14:43 +00:00
Alan Viverette
cde6e29ac6 am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev
* commit '637569566d2234b06e08d94acf4db1b0d3be6501':
  Add callback to track and thumb drawables, propagate state in ASLD
2014-09-26 23:19:32 +00:00
Alan Viverette
b067405bf4 Add callback to track and thumb drawables, propagate state in ASLD
BUG: 17665424
Change-Id: I22da4530f3e2869d856102e804f020461a46fe49
2014-09-26 16:12:16 -07:00
Alan Viverette
571cd7e938 am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev
* commit '81e2f789029701b569d3c0deee8bc74fbebab5db':
  Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
2014-09-26 19:44:08 +00:00
Alan Viverette
5004032ebc Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
BUG: 17646144
Change-Id: I58c111d86224dc8f7f557073c0bcbc22ad74aa1b
2014-09-26 10:37:30 -07:00
Alan Viverette
4f79d73d26 am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev
* commit '21662c96fa9d107a60f4ce98f7179264c972b142':
  Cut ripple background alpha in half
2014-09-25 20:23:50 +00:00
Alan Viverette
33ae07ab81 Merge "Cut ripple background alpha in half" into lmp-dev 2014-09-25 20:14:34 +00:00
Alan Viverette
8bdb442703 Cut ripple background alpha in half
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
2014-09-25 13:06:03 -07:00
ztenghui
533b4d3e51 am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84':
  Fix AVD for CTS failure.
2014-09-24 23:18:15 +00:00
ztenghui
dde353394c Merge "Fix AVD for CTS failure." into lmp-dev 2014-09-24 23:07:18 +00:00
ztenghui
98916d146a Fix AVD for CTS failure.
Mostly about changingConfig flags, the fix is just a copy from VectorDrawable.

b/17631551

Change-Id: Ibad9c2f61cd86b15e9bca1d1991c8cd147897bb0
2014-09-23 16:07:27 -07:00
ztenghui
60f27e6571 am aa60232b: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev
* commit 'aa60232b96ace3ab176611c170e950a7b6db5481':
  Fix animation on the some properties
2014-09-23 19:45:28 +00:00
ztenghui
dbcccffc37 Fix animation on the some properties
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
2014-09-23 11:22:26 -07:00
Chris Craik
26d5da351e am 53dc022a: am e99510a4: Merge "Hide other color filter mutability" into lmp-dev
* commit '53dc022a6c12c1b916583dc8aee92cb63c7f73f5':
  Hide other color filter mutability
2014-09-19 18:03:55 +00:00
Chris Craik
f559326b18 Hide other color filter mutability
bug:17262092
Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
2014-09-19 08:54:09 -07:00
Alan Viverette
e45ed5e85f am a96b8ea7: am 6a750aa9: Merge "Reduce overdraw after clearing ripples in RippleDrawable" into lmp-dev
* commit 'a96b8ea7fe489965b7381b59169dd20fd46d334c':
  Reduce overdraw after clearing ripples in RippleDrawable
2014-09-16 08:59:13 +00:00
ztenghui
9a51c4b17d am 64672ef1: am 3137b288: Merge "Set cache dirty when re-create the cache bitmap" into lmp-dev
* commit '64672ef149fa48afcf7f5f4b2ed0f96386b6d368':
  Set cache dirty when re-create the cache bitmap
2014-09-16 08:58:53 +00:00
Alan Viverette
238aeca552 Merge "Reduce overdraw after clearing ripples in RippleDrawable" into lmp-dev 2014-09-16 00:37:16 +00:00
ztenghui
9c13ed366f Set cache dirty when re-create the cache bitmap
b/17503595

Change-Id: Icdaa3651345b740772363f8afb29bb36741fcc87
2014-09-15 23:41:34 +00:00
Alan Viverette
2ae5640354 Reduce overdraw after clearing ripples in RippleDrawable
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
2014-09-15 12:27:13 -07:00
Alan Viverette
8c9e8e3083 am 3512e8d6: am 1e8bb662: Merge "Apply VectorDrawable color filter at draw time" into lmp-dev
* commit '3512e8d63d5ea422876661a38d01766d15cbf096':
  Apply VectorDrawable color filter at draw time
2014-09-13 02:35:14 +00:00
Alan Viverette
068a026187 am 2b4de8b4: am f559f89c: Merge "Report button opacity for current state, fix button shadows" into lmp-dev
* commit '2b4de8b4ee417695cdc88e9aef0aded47036e8ef':
  Report button opacity for current state, fix button shadows
2014-09-13 02:33:52 +00:00
Alan Viverette
264ea9c35f Merge "Apply VectorDrawable color filter at draw time" into lmp-dev 2014-09-12 23:47:55 +00:00
Alan Viverette
b07b086bd4 Apply VectorDrawable color filter at draw time
BUG: 17491152
Change-Id: Ia0ca0bd7cd00363ad5777d3e2e62fa1131a6d8a5
2014-09-12 16:37:44 -07:00
ztenghui
a5d91d52b4 am 8207e209: am 2bb77b5a: Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev
* commit '8207e209ade72f13a1ed77f5bc219163385a28af':
  Add root alpha and animation to (Animated)VectorDrawable
2014-09-12 23:22:34 +00:00
Alan Viverette
6d32576312 Merge "Report button opacity for current state, fix button shadows" into lmp-dev 2014-09-12 23:14:33 +00:00
Alan Viverette
888b4cf73c Report button opacity for current state, fix button shadows
BUG: 17433604
Change-Id: I25e0bd9b96e09ed2a4d85476b60f459e7cc33002
2014-09-12 16:13:32 -07:00
ztenghui
74cc5c39ae Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev 2014-09-12 22:12:03 +00:00
ztenghui
8490354dc6 Add root alpha and animation to (Animated)VectorDrawable
b/17393626

Change-Id: If6a28b072f7d4bcb2b57022d86ec784f4c0d78f1
2014-09-12 15:11:10 -07:00
Alan Viverette
0cfc7717aa am 5dee9c9b: am 855fc8c7: Update icons to vectors, fix preload theming & vector tinting
* commit '5dee9c9b3e68e7567e765b7abb5ba3d3f05ce989':
  Update icons to vectors, fix preload theming & vector tinting
2014-09-12 20:52:03 +00:00
Alan Viverette
607bd84826 Update icons to vectors, fix preload theming & vector tinting
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
2014-09-12 13:06:45 -07:00
Chet Haase
51698b5e0d am 7768b45e: am f23dcf73: Merge "Unfilled shapes should not report themselves as opaque" into lmp-dev
* commit '7768b45e8e49a87709f752ed1a3f67616b70f76a':
  Unfilled shapes should not report themselves as opaque
2014-09-12 05:46:39 +00:00
Chris Craik
3c813371be am d6ec00a6: am f1101afa: Merge "Fix null rect parameter for saveLayer / saveLayerAlpha" into lmp-dev
* commit 'd6ec00a609c31d40493bfa15314763ec8937f09d':
  Fix null rect parameter for saveLayer / saveLayerAlpha
2014-09-12 05:46:30 +00:00
Chet Haase
25877af238 Merge "Unfilled shapes should not report themselves as opaque" into lmp-dev 2014-09-12 00:54:18 +00:00
Chet Haase
22cf0b0cb8 Unfilled shapes should not report themselves as opaque
Issue #17470611 Stroked, unfilled GradientDrawable shouldn't cast a shadow

Change-Id: Ied60e12c2d2567efec8dac1fe69c77b49ef25b8e
2014-09-11 17:45:43 -07:00
Chris Craik
9bc13a353f Fix null rect parameter for saveLayer / saveLayerAlpha
bug:17476559
Change-Id: I3ba43c9eed8f6fc455eb41e0990e75e0f4c7b648
2014-09-11 16:55:10 -07:00