Alan Viverette
e0f95f39c5
Fix issues with theming of preloaded ColorStateLists
...
Ensures changing configurations mask is propagated to the host drawable
so that it can be properly cleared from cache on configuration changes.
Also fixes constant state handling of the mask in the Inset and Rotate
drawables.
Hides new ColorStateList methods related to theming, since they should
only be used during preloading or internally by framework drawables.
Fixes bug where the cached versions of themeable ColorStateLists were
modified by calling applyTheme() on the host drawable.
Also cleans up some docs and naming in GradientDrawable.
Bug: 19966397
Change-Id: I8c8d3cabbaf94b488c2b8fe9fd423e07d824c19c
2015-04-01 13:10:18 -07:00
Yin-Chia Yeh
37ec99b19c
Merge "Add RAW12 image format"
2015-03-31 18:27:23 +00:00
Zhijun He
2f17431194
ImageFormat: add PRIVATE format
...
Bug: 19865019
Change-Id: I1a9335fe1733a5b28d9cb20485b509fb216cb52b
2015-03-30 16:17:35 -07:00
Alan Viverette
acc6241da9
Merge "Only verify resolved theme attributes"
2015-03-27 18:03:08 +00:00
Alan Viverette
ee7c65d539
Only verify resolved theme attributes
...
Bug: 19962473
Change-Id: I62eb2faea7b09fd483194b41e815179cb2141fcb
2015-03-27 10:57:34 -07:00
ztenghui
304bbd117d
Merge "Polish the documentation for VectorDrawable and AnimatedVectorDrawable"
2015-03-26 20:47:44 +00:00
ztenghui
0ea3aca4eb
Polish the documentation for VectorDrawable and AnimatedVectorDrawable
...
Change-Id: If6bedf84cb01971c55b5a99ad921303dad638b24
2015-03-26 11:34:36 -07:00
ztenghui
34c623cbf3
Don't draw when bounds are negative
...
b/19922909
Change-Id: I68559ed683031f57538439e0a3e4979fe9f430a5
2015-03-25 15:01:58 -07:00
ztenghui
9c265091cf
Merge "Add listener support in AVD"
2015-03-24 23:22:28 +00:00
ztenghui
1588f0ff54
Add listener support in AVD
...
Internally, switch to use AnimatorSet instead of an array of Animators
b/19825918
Change-Id: Ia67d2cc7dd89362e6b0019c916d3f2a0d0f3e39e
2015-03-24 15:49:13 -07:00
Andreas Gampe
84d9e0ef0b
am 5e968ad1: am dde72862: am 7db6ebe0: Merge "Frameworks/base: Don\'t allocate another identity matrix"
...
* commit '5e968ad1d6c0387fb6b71b3693f5c0e95ccf469f':
Frameworks/base: Don't allocate another identity matrix
2015-03-24 16:28:23 +00:00
Andreas Gampe
7db6ebe037
Merge "Frameworks/base: Don't allocate another identity matrix"
2015-03-24 16:02:55 +00:00
Yin-Chia Yeh
11d444f0b7
Add RAW12 image format
...
Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
2015-03-20 17:40:01 -07:00
Alan Viverette
1b23240f96
Only propagate state changes if wrapped drawable is stateful
...
Always update layer bounds if the contained drawable changed in any
way. Also adds null annotations in LayerDrawable and throws a more
useful exception when the layers argument is null.
Change-Id: Iae0cba68257e48b6a45fe081c3d4b0509d2dedd5
2015-03-20 11:08:46 -07:00
Alan Viverette
fc8882f134
Clean up ripple exit, null out software animators on cancel/end
...
Bug: 19682421
Change-Id: I40ff56ed98a6c67cd01c74e455899825013a1f12
2015-03-18 17:26:54 -07:00
Chris Craik
43c410eaac
Merge "Remove HardwareCanvas"
2015-03-18 21:36:56 +00:00
Andreas Gampe
7463438912
am 46277ba2: am 28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final"
...
* commit '46277ba2c70e9fe0fc9772dcb84040aff1c322be':
Frameworks/base: Make IDENTITY_MATRIX final
2015-03-17 22:02:36 +00:00
Andreas Gampe
28e6aeca3a
Merge "Frameworks/base: Make IDENTITY_MATRIX final"
2015-03-17 21:33:09 +00:00
Andreas Gampe
399fa8a60a
Frameworks/base: Make IDENTITY_MATRIX final
...
Bug: 19797138
Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06
2015-03-17 21:31:42 +00:00
Tor Norbye
da81fa569e
Merge "Add resource type annotations to some APIs"
2015-03-16 21:20:31 +00:00
Andreas Gampe
08067d9829
am 8e176d39: am 007e207b: Merge "Frameworks/base: Fix null-pointer check"
...
* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
Frameworks/base: Fix null-pointer check
2015-03-16 17:20:12 +00:00
Andreas Gampe
d538fa0fb2
Frameworks/base: Don't allocate another identity matrix
...
There is already an identity matrix in Matrix. Don't allocate another
one for VectorDrawable.
Change-Id: I51735f262d6680e043b0009707ec42acb2d0d1ad
2015-03-15 19:03:29 -07:00
Andreas Gampe
f2b1cff4e2
Frameworks/base: Fix null-pointer check
...
Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
2015-03-15 15:07:19 -07:00
Raph Levien
210a189e22
Add HyphenEdit support to Paint
...
This adds HyphenEdit on the C++ and also to Java via JNI. HyphenEdit is
a Minikin feature for adding hyphens to text without having to edit the
string on the client side.
Change-Id: Icfb228407c1d11a716d055f813da7507acb38fbf
2015-03-14 06:00:23 +00:00
Tor Norbye
417ee5ba89
Add resource type annotations to some APIs
...
Change-Id: I37c8afdaea455aa92bc8270bb2dfd60616c5f9bc
2015-03-13 11:20:45 -07:00
Chris Craik
f6829a0a61
Remove HardwareCanvas
...
Change-Id: I239646a7f00f09d3f76fe6b6162eed86bc0d6e77
2015-03-10 14:56:11 -07:00
Alan Viverette
6a67db4138
Implement bounded ripple animation
...
Bug: 19431322
Change-Id: I5dc1a28d8675cc6fb036b815d6227113c3f1aa4b
2015-03-09 18:54:25 -07:00
Alan Viverette
53776a2b3c
Merge "Refactor ripple components, simplify background animation"
2015-03-10 01:51:59 +00:00
Alan Viverette
f872ee0057
Refactor ripple components, simplify background animation
...
Moves animation lifecycle and software/hardware hand-off into a unified
RippleComponent class, which makes it easier to maintain the components.
Adds better javadocs and comments to explain what's going on.
Bug: 19431322
Change-Id: Ifb9b9a7dcc24238719ef12293493ca3df107679f
2015-03-09 18:25:21 -07:00
Eino-Ville Talvala
805f3c9428
Add DEPTH image formats, support in ImageReader
...
- Add an explicit mapping between public ImageFormat/
PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
formats
Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
2015-03-09 16:42:25 -07:00
Tor Norbye
b3ec733bb8
Annotate methods with size and range annotations
...
Change-Id: I666861f0dfae31402b1280e9a966a583b88e2e1a
2015-03-07 20:49:19 -08:00
Tor Norbye
1c2bf03d10
Annotate return values with @CheckReturn
...
Change-Id: Icd8fb6adb591ccd7f35f2336ae716b198abf69c5
2015-03-07 20:49:18 -08:00
Tor Norbye
c0a1b7f9a6
Merge "Annotate ARGB integer parameters with @ColorInt"
2015-03-06 23:15:27 +00:00
Derek Sollenberger
c0bf700441
SkPorterDuff Multiply mode maps to SkXfermode modulate.
...
bug:19627342
Change-Id: I97f26ca1bc8abe2768f4a12cc70fb0fa5d905098
2015-03-06 13:51:04 -05:00
Chris Craik
2d08eaf034
Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""
2015-03-06 18:42:30 +00:00
Chris Craik
1526a458a3
Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""
...
Fix build breakage.
This reverts commit 26b4f598c8b1e99b43261614a6861785638c8c00.
Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
2015-03-06 18:42:15 +00:00
Chris Craik
fdbf68ff6c
Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""
2015-03-06 18:16:45 +00:00
Chris Craik
26b4f598c8
Revert "Remove references to SkPorterDuff as it is deprecated."
...
bug:19627342
This reverts commit a9aded1f6253afbea7906509992a8a3721f731ab.
Change-Id: Ic865edfbd31c9e24d18a1397a1d346633376e20a
2015-03-06 18:15:39 +00:00
Tor Norbye
80756e3888
Annotate ARGB integer parameters with @ColorInt
...
Change-Id: I307f72a382272cf18ddb6b07d9fcb81228568d9a
2015-03-05 16:34:12 -08:00
John Reck
f4faeac352
Cleanup Bitmap JNI attempt #2
...
Original version missed a spot
This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.
Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
2015-03-05 13:56:16 -08:00
Chad Jones
b9a468eb19
Merge "Revert "Cleanup Bitmap JNI""
2015-03-05 19:35:15 +00:00
Chad Jones
c02977e3bb
Revert "Cleanup Bitmap JNI"
...
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.
Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
2015-03-05 19:34:26 +00:00
John Reck
35da7d904b
Merge "Cleanup Bitmap JNI"
2015-03-05 18:12:35 +00:00
John Reck
b2915245b7
Cleanup Bitmap JNI
...
Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense
Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
2015-03-05 09:55:02 -08:00
Chris Craik
a0bfb2d99f
Merge "Fix push shader to native"
2015-03-05 17:37:45 +00:00
Chris Craik
6170cd1f35
Fix push shader to native
...
bug:19586908
Change-Id: Ie6205bc76667222f2df2da60a27244988f3a2b3b
2015-03-05 09:32:19 -08:00
Derek Sollenberger
a9aded1f62
Remove references to SkPorterDuff as it is deprecated.
...
Change-Id: Ic0722cfef4ed61aa546c495924397097a45cfe77
2015-03-05 09:37:34 -05:00
Chris Craik
4939e2bf36
Merge "Improve docs for drawable tint and color filters"
2015-03-03 16:46:48 +00:00
Chris Craik
bd3bfc5285
Improve docs for drawable tint and color filters
...
bug:19564477
Change-Id: I7e11baae2d4dd245965904c85b8855de71f6b6ac
2015-03-02 16:21:02 -08:00
John Spurlock
08c7116ab9
Remove unused imports in frameworks/base.
...
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00