2611 Commits

Author SHA1 Message Date
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
Alan Viverette
25f0e6183b Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500"
Bug: 19522833
Bug: 19528265
This reverts commit 72710f11ecd3baf468bf649283453cb7aafe4d74.

Change-Id: I7235ae3ca53696f029cc18f19fe1d373c4f54bbf
2015-02-27 12:34:30 -08:00
Alan Viverette
5bc5d7c45f Merge "Propagate original Resources to DrawableContainer if no override set" 2015-02-26 20:53:39 +00:00
Alan Viverette
102a6bff77 Propagate original Resources to DrawableContainer if no override set
Also fixes a double-add in ASLD.

Bug: 19498949
Change-Id: I9e7e0a0fb22a23518c80c1b099f8da0e0c1f53d8
2015-02-26 12:52:47 -08:00
Alan Viverette
70e68e0ff1 Set AnimationDrawable running to false unless animation is scheduled
Also cleans up java docs and clarifies functionality of nextFrame().

Bug: 19500067
Change-Id: I8c274c6f4df7ee17d28ae151009f07a420c9ab1a
2015-02-26 10:50:55 -08:00
Alan Viverette
40d13f260c Merge "Remove obsolete code from AnimatedRotateDrawable state" 2015-02-26 01:56:14 +00:00
Alan Viverette
039bd51a23 Remove obsolete code from AnimatedRotateDrawable state
DrawableWrappers shouldn't have drawables inside their state, nor should
they manage their own drawables. Also cleans up documentation.

Bug: 19518051
Change-Id: I2aea011afe80e94aadec702e1680c3765528b112
2015-02-25 17:55:22 -08:00
Alan Viverette
a6d4484218 Merge "Create blank state in no-arg RotateDrawable constructor" 2015-02-25 19:15:40 +00:00
Alan Viverette
f74869698a Create blank state in no-arg RotateDrawable constructor
Also removes unnecessary constructor in InsetState so that it matches
the other DrawableWrapper classes.

Bug: 19489698
Change-Id: Ib2e510c6ae90858774970d928e541a9b08cb714a
2015-02-25 11:12:55 -08:00
Alan Viverette
32adbd3524 Merge "Always apply color filter passed to DrawableContainer.setColorFilter" 2015-02-24 01:22:17 +00:00
Alan Viverette
6f51440a74 Always apply color filter passed to DrawableContainer.setColorFilter
Bug: 19461256
Change-Id: Id44d276739b868e504139cdf767992039f3e4336
2015-02-23 17:21:24 -08:00
Alan Viverette
6a8253fdc9 Update progress bar and seek bar backgrounds, fix seek bar thumb
Ensures LayerDrawable copies out the correct layer properties during
"tileification". This really needs to be deprecated or replaced in a
future CL, though, because it is potentially lossy (e.g. for
RippleDrawable, which is an instanceof LayerDrawable).

Bug: 19448441
Change-Id: I483e9c34fd781e280c13eb5951f96bc71a252819
2015-02-23 12:49:47 -08:00
Alan Viverette
b3f3762ee0 Merge "Unify wrapper-type drawables" 2015-02-23 20:39:01 +00:00
Elliott Hughes
65bc1f5214 am 031a9b13: am 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo."
* commit '031a9b13197f6ab1ff83ccdafd890351b70bb63c':
  Fix 'fuchsia' typo.
2015-02-21 17:24:33 +00:00
Elliott Hughes
92c4f1756d am d002e027: Merge "Fix \'fuchsia\' typo."
* commit 'd002e02750b51fed3da41a2b4b222824df8d1a10':
  Fix 'fuchsia' typo.
2015-02-21 17:09:46 +00:00
Elliott Hughes
fd9bc7bb36 Fix 'fuchsia' typo.
Bug: https://code.google.com/p/android/issues/detail?id=152142
Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
2015-02-21 09:03:13 -08:00
Alan Viverette
a129622071 Unify wrapper-type drawables
Fixes several issues with constant state and propagation of drawable
property changes to wrapped drawables. Also un-hides the layout
direction accessors and hotspot getter.

Change-Id: Iff19db6a95059cbcfcbde7af0ac33871ccd41615
2015-02-20 15:00:25 -08:00
Alan Viverette
72710f11ec Use ObjectAnimator for fading scrollbars, set initial duration to 1500
Fairly intensive refactoring of ScrollabilityCache.

Change-Id: I88669c0b9b79ca12a237606d5ff8be0e7e8b37ba
2015-02-20 11:10:22 -08:00
Alan Viverette
88d44d4ada Add attribute for controlling ripple radius
Sets up the action bar item and control styles to use a 20dp radius
ripple to match latest Material spec.

Bug: 19370157
Change-Id: I87cba01076ee83937a6bfd36fc7dc188e1eb4672
2015-02-13 11:11:12 -08:00
Alan Viverette
d8c18e81c0 API for adding layers to LayerDrawable
Change-Id: I859c956a47d95fa1ce65b9eea9bc7be4659486bf
2015-02-12 18:49:42 +00:00
Alan Viverette
a756fd9af6 Prevent temp rect reuse across methods in LayerDrawable
Drawable invalidation may call back into methods that are relying on
the same temp rect objects, which mangles the values.

Bug: 19321598
Change-Id: If8aa434cf85c81d22b5d580e258926087248cd93
2015-02-10 16:39:46 -08:00
Alan Viverette
7354b30d90 Add layer width, height, gravity, and RTL insets for LayerDrawable
Bug: 18473819
Change-Id: Iae8e3dbd3fcc7f4c2f08b266c69d40036e75dfb6
2015-02-03 13:24:59 -08:00
Alan Viverette
e300553a01 Merge "Ensure InsetDrawable propagates state and callback on set drawable" 2015-02-02 18:01:04 +00:00
Alan Viverette
bc43ac2094 Ensure InsetDrawable propagates state and callback on set drawable
Bug: 19230432
Change-Id: I161e377c5a50fd68718a36cef0038ab06e74c90d
2015-02-02 09:56:49 -08:00
Alan Viverette
7d6854a229 Synchronize mutated constant state's drawable constant state
Mutating InsetDrawable's locally-held drawable alters its constant state,
so we need to update the InsetDrawable's reference to match. This ensures
that any drawables created using getConstantState().newDrawable() will
match the mutated versions.

Bug: 19213175
Change-Id: If9063bcc0942691a8940443e607f2dc722fc6e13
2015-01-30 16:19:45 -08:00
Derek Sollenberger
1db141f93c Create proxy between Skia's SkCanvas and the framework Canvas.
This enables Picture.java to be replayed into HWUI in addition
to extending the Skia testing suite to HWUI.

Bug: 19011232
Change-Id: Id27ac03eec817b0784763e62ab8413a07b3b8cb2
2015-01-30 12:56:37 -05:00
Leon Scroggins III
9bf106f156 Merge "Move SkAvoidXferMode into frameworks/base." 2015-01-30 13:55:23 +00:00
Leon Scroggins III
626647c3f6 Move SkAvoidXferMode into frameworks/base.
We are removing it from Skia, so we need it here to support Android.

Add some small cleanups (remove comment that doesn't apply, convert
SK_OVERRIDE to override, remove 'virtual' keyword from methods with
'override' on them).

BUG:skbug.com/3329
Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
2015-01-30 08:32:49 -05:00
Alan Viverette
f0f7f8ceb5 Move drawable out of inset state, only store constant state
This ensures that InsetDrawable's constant state only references other
constant states rather than holding an entire Drawable, which provides
a clean separation between local and constant state information. This
ensures that calls to mutate() can create a new constant state without
losing local drawable state and that newDrawable() still relies on
the same constant state.

Bug: 19156549
Bug: 13877782
Change-Id: I48146f6c7ac3593009cfa323fc341bcd7d8ab21b
2015-01-27 12:07:33 -08:00
John Reck
fe026218d0 am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev automerge: bb8d7ff
automerge: 1e5dd46

* commit '1e5dd46133bd47445ba0657692fb86492acad705':
  Prevent memory corruption from use-after-free
2015-01-23 20:37:27 +00:00
John Reck
1e5dd46133 am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
automerge: bb8d7ff

* commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1':
  Prevent memory corruption from use-after-free
2015-01-23 20:33:18 +00:00
John Reck
4018eb3763 Prevent memory corruption from use-after-free
Bug: 19035637

If an app tries to call recycle() on a Bitmap that has
already been finalized it will result in use-after-frees. This is
bad. Avoid this by setting the pointer to 0 and checking for this

Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b
2015-01-23 11:01:05 -08:00