1531 Commits

Author SHA1 Message Date
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
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
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
George Mount
34d8519de4 Merge "Add animations along a Path." 2013-11-20 15:47:00 +00:00
George Mount
c96c7b2e54 Add animations along a Path.
Change-Id: If03bd10a3961ff874e33489e1253146b8dadca33
2013-11-20 07:39:26 -08:00
Tim Murray
eff663f391 Convert Java/JNI to 64-bit, part 1.
This converts context and device storage to use long instead of int.

bug 11332320

Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d
2013-11-19 14:21:58 -08:00
John Spurlock
180979f76b Fix logic problems in AnimationDrawable and View.
1. View now checks both queues when unscheduling runnables,
fixing the case where work was scheduled pre-attach, and unscheduled
post-attach.

2. AnimationDrawable avoids posting duplicate runnables when rescheduling
itself.

3. Decouple is-animation-running state from current frame pointer in
AnimationDrawable.  Some calls init to the first frame, but do not
kick off the animation.

4. Remove workaround in SystemUI's AnimatedImageView (status bar icon)
now that the underlying framework issues are fixed.

Bug:11694594
Change-Id: I77ca6bd80262f7edcf980b2d7efc2592f8051f29
2013-11-18 15:59:37 -05:00
Raph Levien
aff6ea9516 Merge "Initial integration of Minikin to framework" 2013-11-18 19:38:18 +00:00
Raph Levien
a033630e80 Initial integration of Minikin to framework
With this patch, framework does at least some of its text rendering
using Minikin instead of TextLayoutCache. There's a lot of stuff broken
and not yet implemented, but the phone will boot.

Changes are hidden behind USE_MINIKIN, which should be set in
BoardConfig.mk for the brave. Without that, there are changes to
signatures in JNI methods and so on, but shouldn't be any visible
changes.

This commit also introduces a new abstraction for Typeface:

The new TypefaceImpl abstraction represents the functionality that
corresponds to a Java Typeface object. Currently it is backed by
SkTypeface, but in the migration to Minikin it is a FontCollection
combined with a FontStyle. This patch introduces a USE_MINIKIN
preprocessor switch, so there is no substantial change to existing
Skia-based code, but which lets us start replacing the implementation
with the Minikin version.

Change-Id: I532c4c2d32d4f4c1f349dc1db37caa112af587ea
2013-11-18 10:32:20 -08:00
Alan Viverette
616dd4780f Use correct state list for obtaining stroke color
BUG: 11696411
Change-Id: Ia9ad70cbceae18923fc79db8f07223fb0d41ae81
2013-11-14 17:21:47 -08:00
Jason Sams
21659ac4c8 Add long/double read support.
Change-Id: I1957f7ac18262a3004a4adcb7c31055212e483c2
2013-11-11 23:22:53 +00:00
John Reck
2ee011a3c4 Merge "Always do simple path detection" 2013-11-11 17:37:25 +00:00
John Reck
02a2aab57c Always do simple path detection
HardwareRenderer.isAvailable() only returns false under an emulator
 As such eliminate Path's dependency on the HardwareRenderer by
 always doing simple path detection. The only drawback is a bit of
 wasted work in the emulator.

Change-Id: I89d452bd24a6c6751ed8017c13a9e97f8a1a940d
2013-11-08 16:39:13 -08:00
Svetoslav
765c9dfd54 am ebd616e8: am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev
* commit 'ebd616e88dab185bbf5b309d29c92a9eea9817e0':
  Switch to the new Skia PDF generation APIs.
2013-11-07 16:28:39 -08:00
Svetoslav
134631b907 am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev
* commit '90242fe5581c8f665c09337a0971a7c3fc908f7c':
  Switch to the new Skia PDF generation APIs.
2013-11-07 16:22:22 -08:00
Svetoslav
90242fe558 Merge "Switch to the new Skia PDF generation APIs." into klp-dev 2013-11-08 00:20:10 +00:00
Fabrice Di Meglio
8e0fb6e9c3 am 4833a6ce: am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
* commit '4833a6ce44becf0d73e9727da64d8c7bd0f89549':
  Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
2013-11-07 15:13:09 -08:00
Svetoslav
35aacf2eb3 Switch to the new Skia PDF generation APIs.
The new Skia PDF generation APIs are a small extension to
the code that converts drawing commands to PDF (SkPDFDevice)
and this new functionality is exposed via new APIs. This
change switches to using these new APIs allowing us to
capitalize on the new perspective support for PDF
generation.

bug:11561776

Change-Id: Ief61f7ff6a5a22c27d3acbe99a48910cb679f594
2013-11-07 14:15:19 -08:00
Fabrice Di Meglio
e34c477060 am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
* commit '435c0ee10af132937dc0a22c39380624e6efd5ab':
  Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
2013-11-07 11:21:03 -08:00
Fabrice Di Meglio
435c0ee10a Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev 2013-11-07 19:18:00 +00:00
Newton Allen
badb59cd5d am 47feee53: Merge "Fix some documentation typos." into klp-docs
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
  Fix some documentation typos.
2013-11-07 05:19:12 +00:00
Chris Craik
a2801c5f64 am 4899398d: am baba771c: am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
* commit '4899398dcad50d1b9734ca5f8959712f42f72b02':
  Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
2013-11-06 15:33:42 -08:00
Fabrice Di Meglio
f7a93ef384 Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
- enforce the Drawable boolean getPadding(Rect) contract for NinePatchDrawable
and DrawableContainer.

- as NinePatchDrawable was not enforcing it, the consequence was that the
mUserPaddingLeftInitial / mUserPaddingRitghInitial were reset to "0" (even
if they got the correct value before the reset).

Change-Id: I1efe7fad5f89c0ca47f90189f6d89940e0e9c6ae
2013-11-06 15:32:01 -08:00