1831 Commits

Author SHA1 Message Date
Tim Murray
dbe1aaa6a8 am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '16e9362e5f5b4f09a46198218380bb386fee28e5':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
2014-03-07 01:34:52 +00:00
Tim Murray
ac68141753 am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '8df3ea66994e96d72040c44099dd2d74ba15ec67':
  Convert Java/JNI to 64-bit, part 2.
2014-03-07 01:34:49 +00:00
Tim Murray
516f72448a am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
2014-03-07 01:34:46 +00:00
Tim Murray
b0cb2bb53f am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array"
* commit 'bccee732b53d06c0e983b3f325e0d9ad889de134':
  Use Object + type in place of specific array
2014-03-07 01:34:43 +00:00
Tim Murray
5a00a96482 am 69914882: am e559d7ee: Merge "Utility API for creating types."
* commit '69914882509b8ad81c23eadd1ebae53fb532042b':
  Utility API for creating types.
2014-03-07 01:34:39 +00:00
Tim Murray
f9b86add00 am 271c3b74: am b1c1518e: Merge "Remove old hidden API."
* commit '271c3b7499f53f6e7e168d68910efda5cc19f5fd':
  Remove old hidden API.
2014-03-07 01:34:36 +00:00
Tim Murray
cccdf29d86 am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
  Remove hidden API setSurfaceTexture.
2014-03-07 01:34:33 +00:00
Leon Scroggins III
e648c19bf3 resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp
Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
2014-03-06 20:10:19 -05:00
Leon Scroggins III
87e9e744ed am 92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9':
  DO NOT MERGE - Fix Javadoc build break.
2014-03-06 21:31:31 +00:00
Leon Scroggins III
92a3283286 DO NOT MERGE - Fix Javadoc build break.
Remove links to non-specific function name.

Bug: 13246311

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
2014-03-06 20:44:16 +00:00
Leon Scroggins III
8d3281f5f7 am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
* commit 'ee008d4264a95bba5f90b17856fc06fa29a6f12c':
  Update framework to use M33 Skia. DO NOT MERGE
2014-03-06 19:49:58 +00:00
Leon Scroggins III
5e49b497ae Update framework to use M33 Skia. DO NOT MERGE
(These CLs are already in master.)

Bug: 13246311

This cherry-picks 7 CLs:

-----------------------------------------------------------------------

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.

cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a

-----------------------------------------------------------------------

Merge AssetStream with AssetStreamAdaptor.

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
  the length (read(NULL, 0)) is no longer implemented, since it is
  no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
  so some implementation is necessary.

cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56

-----------------------------------------------------------------------

Deprecate Android-specific SkPaint functions.

The following functions were problematic:
 const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
 const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
 const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08

-----------------------------------------------------------------------

pass SkGlyphCache into updateGlyphCache()

Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89

-----------------------------------------------------------------------

Updates to the Skia API needed to merge the WebView m33 version of Skia.

cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3

Bugfix for screenshots (recent apps) due to incorrect rowBytes computation

bug: 12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714

-----------------------------------------------------------------------

Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.

cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5

-----------------------------------------------------------------------

Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
2014-03-06 12:14:47 -05:00
Chris Craik
5be83edd15 Add Path.isConvex, and force View outlines to be convex
Change-Id: Idf3f1ee44240d77f7a7ddd0da898da8aa5d41864
2014-03-03 16:16:19 -08:00
Alan Viverette
af7c240b99 Restore getTintMode() method on BitmapDrawable
Change-Id: I8fffc90ce3f0811d75b517d2dfc71de731188da6
2014-02-26 17:20:10 -08:00
Alan Viverette
09ceac298c Clean up tint API
Change-Id: I56056e7596840c563f5332922d63e8893a0cac17
2014-02-26 16:49:10 -08:00
Alan Viverette
2cc13d0ef1 Fix shape drawable constructor
Change-Id: Ibb2c1993faf9d2baae3130f334475aa07fbe9015
2014-02-26 16:26:33 -08:00
Alan Viverette
813d85b82c Fix progress bar tinting, add tint support to ShapeDrawable
Cleans up APIs a little, since I think we may want to add tinting
modes beyond what Porter-Duff can provide. Plus we don't actually
support some of the Porter-Duff modes in hardware.

Change-Id: I2cea1b737cc93607a24842c54eb9f0d8346b29d4
2014-02-26 15:38:51 -08:00
John Spurlock
a77cf87354 Merge "Tabs -> spaces in frameworks/base." 2014-02-25 19:57:33 +00:00
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base.
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
2014-02-25 09:49:29 -05:00
Derek Sollenberger
b644a3b845 Updates to the Skia API needed to merge the WebView m33 version of Skia.
This is a cherry-pick of 2 CLs:

21969a2b26945da3fd86aef7c93479e4fb359a65
c7a581cf7691db5c61e6694aa51daaa994004bd9

Change-Id: I6fd9366fbba0a336de1df794be9497983bfd13ae
2014-02-24 15:44:31 -05:00
Alan Viverette
12b97f5d2b Change colorFilterColor to tint, allow use of ColorStateList
BUG: 13149901
Change-Id: I6487bec372cb74db53d7bbdfa35de071764763b0
2014-02-23 18:32:20 -08:00
Alan Viverette
cb29189c29 Fix density in touch feedback drawable
Change-Id: I90b08aea9f5ba0a29ae5328960bacebc6c2099d8
2014-02-20 14:03:27 -08:00
Alan Viverette
7f610fed10 Fix for reveal animated drawables
Includes fixes for RevealDrawable clipping, touch feedback constant
state, and action bar background display lists.

BUG: 13065159
Change-Id: Ie4bf03f59da69047e18a8fe9233c3d24b0160576
2014-02-19 14:40:12 -08:00
Alan Viverette
b32b8a52a3 Fix gradient radius type
BUG: 13029355
Change-Id: I5139d5da592b8bbf420a31895ae50c365538b9cf
2014-02-14 12:54:33 -08:00
Alan Viverette
861621eb8a Fix gradient radius attribute to match documentation
BUG: 12191666
Change-Id: I62de3296500543797c595eeee15aa250e5b1511a
2014-02-12 13:50:34 -08:00
Narayan Kamath
a1cffb429c am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
* commit 'd350af9695018e81f85600fb7dd906003cbaf62e':
  Use long for pointers in EmojiFactory and PdfDocument
2014-02-11 16:40:27 +00:00
Narayan Kamath
d350af9695 am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
  Use long for pointers in EmojiFactory and PdfDocument
2014-02-11 16:34:04 +00:00
Narayan Kamath
f44a3f1e00 Merge "Use long for pointers in EmojiFactory and PdfDocument" 2014-02-11 14:07:17 +00:00
Derek Sollenberger
76d3a1b8d0 Removing SkiaColorFilter and inspecting the native object directly.
bug: 10650594
Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
2014-02-07 17:06:14 -05:00
Alan Viverette
d5154ec2bc Add prototype for borderless touch feedback drawable
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
2014-02-05 17:53:33 -08:00
Alan Viverette
87980f9a73 Adds hotspot support to LayerDrawable and InsetDrawable
Change-Id: Id17f460c8e4e0a6bf9fd39a4a7b8c79fa2df8d29
2014-02-05 14:05:51 -08:00
Alan Viverette
a8b2edec93 Clean up RotateDrawable, add getters and setters for XML properties
Change-Id: I1bb174e981fb6df910fee3a9d596c0249282928c
2014-02-03 18:08:34 -08:00
Tim Murray
2905039d52 am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '16e9362e5f5b4f09a46198218380bb386fee28e5':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
2014-02-03 22:45:02 +00:00
Tim Murray
47f295e8cb am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '8df3ea66994e96d72040c44099dd2d74ba15ec67':
  Convert Java/JNI to 64-bit, part 2.
2014-02-03 22:44:58 +00:00
Tim Murray
041c77ac44 am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
2014-02-03 22:44:54 +00:00
Tim Murray
923da98f79 am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array"
* commit 'bccee732b53d06c0e983b3f325e0d9ad889de134':
  Use Object + type in place of specific array
2014-02-03 22:44:51 +00:00
Tim Murray
4e5e654e7a am 69914882: am e559d7ee: Merge "Utility API for creating types."
* commit '69914882509b8ad81c23eadd1ebae53fb532042b':
  Utility API for creating types.
2014-02-03 22:44:47 +00:00
Tim Murray
b0a79d3592 am 271c3b74: am b1c1518e: Merge "Remove old hidden API."
* commit '271c3b7499f53f6e7e168d68910efda5cc19f5fd':
  Remove old hidden API.
2014-02-03 22:44:44 +00:00
Tim Murray
a392cdf375 am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
  Remove hidden API setSurfaceTexture.
2014-02-03 22:44:39 +00:00
Tim Murray
8df3ea6699 am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit 'b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9':
  Convert Java/JNI to 64-bit, part 2.
2014-02-03 14:41:14 -08:00
Tim Murray
72d637e297 am e22e268e: Merge changes If93a5d78,I1957f7ac
* commit 'e22e268e6d158f37173b1bce37a5614daabcf18c':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
2014-02-03 14:41:11 -08:00
Tim Murray
bccee732b5 am 61eb6b55: Merge "Use Object + type in place of specific array"
* commit '61eb6b55c6b4db14e025240fc754e1314f57bd00':
  Use Object + type in place of specific array
2014-02-03 14:41:08 -08:00
Tim Murray
6991488250 am e559d7ee: Merge "Utility API for creating types."
* commit 'e559d7ee53a69502c9aef8764bb055ed2d1adb64':
  Utility API for creating types.
2014-02-03 14:41:05 -08:00
Tim Murray
271c3b7499 am b1c1518e: Merge "Remove old hidden API."
* commit 'b1c1518ef1e89fb8bc42022b6455a695cacd949c':
  Remove old hidden API.
2014-02-03 14:41:02 -08:00
Tim Murray
9bad32c383 am aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit 'aea3b5816d8461fcbc4a384874a1a073ecdeafcf':
  Remove hidden API setSurfaceTexture.
2014-02-03 14:41:00 -08:00
Alan Viverette
c8577b384a Merge "Revert "Cache display lists for Drawables"" 2014-01-31 21:07:51 +00:00
Alan Viverette
16f1d81d47 Revert "Cache display lists for Drawables"
This reverts commit c062c7003f34999632fe4ad721dcd47cd71b2159.

Change-Id: I96d4f0482b927101f52140b667f4c38ffc8687f5
2014-01-31 13:04:38 -08:00
Alan Viverette
40df781539 Simplify GradientDrawable's use of ColorStateList
BUG: 12816352
Change-Id: Icff432ee5d460ca733866185b8bf61fd50248cfc
2014-01-31 12:58:43 -08:00
Tim Murray
355707e4f6 Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
2014-01-31 12:35:17 -08:00
Tim Murray
7a629fac82 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
2014-01-31 11:16:09 -08:00