1551 Commits

Author SHA1 Message Date
Alan Viverette
12b61f20a4 Prevent RevealDrawable from drawing mask when layer is empty
Compositing the mask layer into an empty layer using SRC_IN will
actually composite into the layer UNDER the empty layer.

Change-Id: I5ba434b0d7e6a5bc707fe842a5db82ae33066912
2014-01-17 15:38:20 -08:00
Narayan Kamath
4d7f945066 am 8492e88a: am 077386db: am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '8492e88a23ee4ac32f05b277654e0f9455fefa9b':
  AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 15:57:58 +00:00
Narayan Kamath
6606d16e09 am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '6706888e24aee04c2c914c44e5ef5b1510cf8013':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 15:57:47 +00:00
Narayan Kamath
6b81bfd10f am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit 'caea42fd2daabedaed383105e10c11150f52b7df':
  AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 07:35:16 -08:00
Narayan Kamath
03e8be757d am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '8796ab7f22d3e9f5b85571e8851851c023416f96':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 07:35:06 -08:00
Narayan Kamath
caea42fd2d am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '98002dfb60a20caf62d6682659547c042a4a3342':
  AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 07:31:58 -08:00
Narayan Kamath
8796ab7f22 am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit 'bb35356dc05632664e1d65588c9d0570c185280b':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 07:31:53 -08:00
Narayan Kamath
98002dfb60 Merge "AArch64: Use long for pointers in graphics/PathMeasure" 2014-01-16 12:12:11 +00:00
Chet Haase
c8f0b11cc4 Fix bug in PathMeasure with trimmed paths
Logic in the hardware renderer optimizes path rendering for simple
paths that consist of only rectangles. Any operation on the path that
adds any other primitive sets the simplicity flag to false appropriately.
PathMeasure.getSegment(), however, avoids those code paths and never sets
the mIsSimple flag at all, so it returns its original value (true, if the
path was simply constructed with no operations before being used in the
getSegment() call).

The fix is to avoid the optimization for paths used in getSegment(), since
it's not clear what operations will end up in the path and it's likely not
going to be just simple rectangles in any case.

Issue #12533902 PathMeasure.getSegment is broken

Change-Id: I71e77207e4d5c649c326557d33eba31e9b0fd45e
2014-01-15 12:12:20 -08:00
Leon Scroggins III
2bc49ca96e Fix Javadoc build break.
Remove links to non-specific function name.

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
2014-01-15 14:23:14 -05:00
Leon Scroggins III
8790be6de3 Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
2014-01-15 11:37:04 -05:00
Ashok Bhat
b091d47a2e AArch64: Use long for pointers in BitmapRegionDecoder
For storing pointers, long is used in BitmapRegionDecoder
class, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.

Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:23:22 +00:00
Ashok Bhat
dcaf5593dd AArch64: Use long for pointers in Movie class
For storing pointers, long is used in Movie class,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:22:56 +00:00
Alan Viverette
c6c243bf01 Merge "Propagate first call to DrawableContainer.setAlpha() to children" 2014-01-15 02:24:44 +00:00
Alan Viverette
34bd56b546 Propagate first call to DrawableContainer.setAlpha() to children
BUG: 12530662
Change-Id: Idd972698d1a6805cb9f66ba4c2ddde97e1f8d2ca
2014-01-14 18:19:09 -08:00
Alan Viverette
c062c7003f Cache display lists for Drawables
Change-Id: I86e2dd4cd4ac8871f4131450cb9082c2b8de2eed
2014-01-14 17:16:29 -08:00
Alan Viverette
ee779ea446 Fixing LayerDrawable methods for find layer and invalidate
BUG: 12475487
BUG: 12475575
Change-Id: I98eb2674a5090a20cae1cd69db6022859dcab36c
2014-01-13 12:59:50 -08:00
Ashok Bhat
0c10cc6052 AArch64: Use long for pointers in graphics/PathMeasure
For storing pointers, long is used in
android/graphics/PathMeasure class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I4599a9d5f7dcf9c39838db96d9033059114d3a49
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-13 14:50:50 +00:00
Alan Viverette
6ae1bdebf3 Merge "Revert "Fixing Drawable methods for find by layer ID and invalidation callback"" 2014-01-10 22:52:51 +00:00
Alan Viverette
218974915a Revert "Fixing Drawable methods for find by layer ID and invalidation callback"
This reverts commit 8f164f64ec55a973fc043de932d853dd41772e4e.

Change-Id: I35637dee7b58c77387f375de585713ff76d4dd87
2014-01-10 22:52:42 +00:00
Alan Viverette
7682e03964 Merge "Fixes for DrawableContainer, LayerDrawable" 2014-01-10 22:10:14 +00:00
Alan Viverette
8f164f64ec Fixing Drawable methods for find by layer ID and invalidation callback
BUG: 12475487, 12475575
Change-Id: Icbf11c76eaf9357fe2076bf60f7e448db65bc835
2014-01-09 15:15:01 -08:00
Alan Viverette
729427d451 Fixes for DrawableContainer, LayerDrawable
Only propagate DrawableContainer color filter, alpha when explicitly
modified. Invalidate LayerDrawable padding when child inset modified.

Change-Id: I27c6fe3c2d71b92bfbc54cc829e1efc7bc35e566
2014-01-07 17:56:57 -08:00
Alan Viverette
e2802755b1 Merge "Add support for specifying Drawable color filter in XML" 2014-01-07 23:53:47 +00:00
Alan Viverette
d9e788c4f0 Add support for specifying Drawable color filter in XML
BUG: 12178044
Change-Id: Ie118aebf56bb4580c97b625e20f4e76bed4b6f6f
2014-01-07 11:30:24 -08:00
Alan Viverette
197315e390 Use layers for reveal drawable
Change-Id: I82887bb0a3994127ec0bd43ac017d51901a40488
2014-01-03 17:51:01 -08:00
Stephen Hines
57cf560719 DO NOT MERGE - Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
2013-12-18 16:24:21 -08:00
Tim Murray
638fcf0df6 Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 2013-12-17 22:14:29 +00:00
Alan Viverette
223622a50d Add reveal drawable, APIs for forwarding Drawable focus and touch
Hotspot APIs are hidden pending finalization of how we handle IDs.

BUG: 11416827
Change-Id: Iecacb4b8e3690930d2d805ae65a50cf33482a218
2013-12-17 21:33:38 +00:00
Tim Murray
d1576fb039 Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
2013-12-17 13:28:17 -08:00
Alan Viverette
083f5518d7 Fix stroke color in GradientState.initializeWithState()
BUG: 12175674
Change-Id: I084339fd3c31a9b49f5875c9d3bac8f50cd027ca
2013-12-16 17:55:08 -08:00
George Mount
7fe03a267e Add Path trimming.
Change-Id: Iafcf127a5136883ad4c0185d3c15f96d67f38d0d
2013-12-09 14:34:54 -08:00
Alan Viverette
89417177d5 Fix typo in LayerDrawable
Change-Id: I6c73cb90d0c161d29e8d41c54850d66840c947d7
2013-12-05 15:34:28 -08:00
The Android Open Source Project
ebcb32f58a Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
2013-12-05 13:10:46 -08:00
Alan Viverette
ad7d65daed Merge "Add stacked padding mode to LayerDrawable" 2013-12-05 19:28:27 +00:00
Alan Viverette
5b10a723b0 Add stacked padding mode to LayerDrawable
General cleanup of LayerDrawable for readability's sake.

BUG: 11695507
Change-Id: Id7811b3c168ef68134d53b93fe9ac36dc9440566
2013-12-05 11:12:17 -08:00
Alan Viverette
7c263c6ee7 Handle null argument to GradientDrawable.setColor() and setStroke()
BUG: 11966834
Change-Id: I5d17bd846b95eceaa7aa1dff64a3e6886f7e6539
2013-12-02 19:30:51 -08:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
2013-12-02 12:37:58 -08:00
Jason Sams
afb02269cf Merge commit '1ccc6633' into manualmerge
Conflicts:
	graphics/java/android/renderscript/Double2.java
	graphics/java/android/renderscript/Double3.java
	graphics/java/android/renderscript/Double4.java
	graphics/java/android/renderscript/Float2.java
	graphics/java/android/renderscript/Float3.java
	graphics/java/android/renderscript/Float4.java
	graphics/java/android/renderscript/Int2.java
	graphics/java/android/renderscript/Int3.java
	graphics/java/android/renderscript/Int4.java
	graphics/java/android/renderscript/Long2.java
	graphics/java/android/renderscript/Long3.java
	graphics/java/android/renderscript/Long4.java
	graphics/java/android/renderscript/Short2.java
	graphics/java/android/renderscript/Short3.java
	graphics/java/android/renderscript/Short4.java

Change-Id: Ib9e940bc7d62764020eea7639d7158af707eb33f
2013-11-27 15:30:06 -08:00
Ying Wang
1622981ca4 Fix sdk build.
Change-Id: I11471213826b212b99c0ddba89a7f4cef110fcc4
2013-11-26 15:47:43 -08:00
Katie McCormick
37e4c405a6 am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '484b57a5655f28967e0062f578f38535dff52323':
  Doc updates: Javadoc fixes
2013-11-26 14:00:33 -08:00
Katie McCormick
484b57a565 am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
  Doc updates: Javadoc fixes
2013-11-26 21:58:18 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
2013-11-26 13:52:48 -08:00
Jason Sams
1ccc6633bf am 9e6d8f04: Merge "Adding operations to reflected Renderscript class"
* commit '9e6d8f04940fd710ae858ff7ee4df43eb03ea85e':
  Adding operations to reflected Renderscript class
2013-11-26 12:32:22 -08:00
Jason Sams
3042d2692f Generic object based data copy.
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present.  This adds support for long/double and reduces
the amount of code present.  We could also support arrays of vectors
or objects in the future with this mechanism.


Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
2013-11-26 12:29:46 -08:00
Jason Sams
9e6d8f0494 Merge "Adding operations to reflected Renderscript class" 2013-11-26 20:23:44 +00:00
Tim Murray
8437967733 Merge "Convert Java/JNI to 64-bit, part 2." 2013-11-20 22:46:47 +00:00
John Spurlock
5d95899881 Merge "Remove unused imports from frameworks/base." 2013-11-20 21:47:52 +00:00
Tim Murray
460a04971c Convert Java/JNI to 64-bit, part 2.
This changes BaseObj to support 64-bit IDs. There are a few caveats:

1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.

bug 11332320

Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
2013-11-20 10:18:04 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
2013-11-20 11:31:47 -05:00