1304 Commits

Author SHA1 Message Date
Victoria Lease
c85637f0e6 am c69bce2e: Merge "fix argument mismatches in Paint JNI"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'c69bce2e41c70da35e1b6a2ab5ec44469ab14c80':
  fix argument mismatches in Paint JNI
2013-02-14 19:59:03 -08:00
Victoria Lease
b61fb10fe4 fix argument mismatches in Paint JNI
Paint.getTextRunCursor() no longer has a "flags" argument on the Java
side. The native side, however, still had the argument, and was being
called with misaligned arguments, causing all manner of madcap fun.

Also, the version of Paint.getTextRunCursor() that took String as an
argument needed to lose the "flags" argument, as well, to prevent an
infinite loop in the CharSequence version of the function, which was
supposed to be calling the String version but was actually calling
itself.

Bug: 8201224
Change-Id: Iad0dabaf81185f29a082566cc64590f2ba9bc31c
2013-02-14 15:58:46 -08:00
Chris Craik
c932760f66 Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE" 2013-02-13 23:14:58 +00:00
Stephen Hines
9b10e27d60 Merge "Add rsnScriptForEachClipped() implementation with no param array." 2013-02-13 23:06:34 +00:00
Fabrice Di Meglio
0c33ecd209 Merge "Clean Paint.mBidiFlags as it is no longer used" 2013-02-13 19:11:50 +00:00
Chris Craik
7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
2013-02-13 10:50:20 -08:00
Stephen Hines
dac6ed0b69 Add rsnScriptForEachClipped() implementation with no param array.
JNI doesn't let us pass down a NULL parameter array (from the usrData part
of our reflection). In this case, we simply clone our existing function, but
remove the offending array parameter.

Change-Id: Ib1d6e202f2a55ba8922eec3da5a93d8daa882250
2013-02-13 00:09:02 -08:00
Tim Murray
43aed48fac Merge "Pass through null LaunchOption structs to standard forEach." 2013-02-13 00:42:37 +00:00
Tim Murray
ba9dd06176 Pass through null LaunchOption structs to standard forEach.
Change-Id: I4dcde6996400207c7e361ff4b7723ec7db832e80
2013-02-12 16:23:19 -08:00
Stephen Hines
aa5d5b1931 Merge "Check Element in all API levels for copy2DRangeFrom()." 2013-02-12 22:47:47 +00:00
Stephen Hines
004158032a Merge "Fix copyFrom() to use proper dimensions for copying." 2013-02-12 22:45:00 +00:00
Jason Sams
d25d037890 Merge "Add FieldPacker contructor that accepts external storage." 2013-02-12 22:22:10 +00:00
Fabrice Di Meglio
6d9fe5bd22 Clean Paint.mBidiFlags as it is no longer used
See bug #7623824

Change-Id: Ie2f9422821f6dcc73c99e8695f448e966b587b1d
2013-02-12 13:12:13 -08:00
Stephen Hines
5f528becb0 Check Element in all API levels for copy2DRangeFrom().
Change-Id: I561317671a16888fc9f35908ab1ae1489a14fc6c
2013-02-08 21:03:51 -08:00
Stephen Hines
a9a7b37405 Fix copyFrom() to use proper dimensions for copying.
This change actually fixes several bugs related to stride:

* copyFrom() needs to call the 2D or 1D version, depending on the dimensions
  of the corresponding Allocation.
* Add an internal-only copy2DRangeFromUnchecked(), since we don't really
  want to expose it as another public API (only via copyFromUnchecked()).
* Call the proper 1D/2D version in copyFromUnchecked() based on the
  Allocation dimensions.
* Add Element checks to the "checked" copy2DRangeFrom() routines.

Change-Id: I690706d36884ee749bf90937c715855f6c07368c
2013-02-08 20:56:00 -08:00
Romain Guy
97dcc20e6d Merge "Deprecate useless BitmapDrawable constructor Bug #2590549" 2013-02-08 22:01:05 +00:00
Romain Guy
7ac40e3869 Deprecate useless BitmapDrawable constructor
Bug #2590549

Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
2013-02-08 14:00:15 -08:00
Jason Sams
5b08a2dc78 Add FieldPacker contructor that accepts
external storage.

Change-Id: I9c796f925802b202eae7e0fe1750a10140ef4a47
2013-02-08 11:22:17 -08:00
Tim Murray
eb8c29cb7e Add API entry points for clipped kernels.
Change-Id: Idf474a5ac391c41e9215cd2f03e7f8c4bfb875fa
2013-02-07 15:22:36 -08:00
Jason Sams
3c6721899e Merge "Implement rs.sendMessage()" 2013-02-07 02:17:53 +00:00
Scott Main
e68c1ce1d4 am 11f1c5b8: am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '11f1c5b89a98cb6794f2b1f158b8c22e38af975f':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:31:26 -08:00
Scott Main
11f1c5b89a am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'b3a57191e62e0c394ba4a3448770853a1fb7ac3b':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:26:46 -08:00
Scott Main
805d2e2d98 am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '00f490844d89b146e5490204a5a483834950c489':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:19:30 -08:00
Derek Sollenberger
23e500d168 Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" 2013-02-06 12:57:38 +00:00
Jason Sams
455d644266 Implement rs.sendMessage()
Change-Id: Ib4f4bb7bb4f697d0b5405ad55721394ed2456c65
2013-02-05 19:20:18 -08:00
Jason Sams
a4b7bc9786 Log non-fatal RS errors.
Change-Id: I3e58b89453af8955ba9df825ec143e793890f44a
2013-02-05 15:05:39 -08:00
Scott Main
b47fa1699a docs: fix renderscript links that currently require redirect
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
2013-02-05 14:23:13 -08:00
Michael Jurka
7f2e4efa96 am c24b1448: Merge "Don\'t mark recycled bitmaps as immutable"
# Via Android (Google) Code Review (1) and Michael Jurka (1)
* commit 'c24b14481527e2f87ddb3a156b8217d32c645b10':
  Don't mark recycled bitmaps as immutable
2013-02-04 09:35:09 -08:00
Michael Jurka
c24b144815 Merge "Don't mark recycled bitmaps as immutable" 2013-02-04 17:31:17 +00:00
Michael Jurka
afce5a4008 Don't mark recycled bitmaps as immutable
Helps avoid Bitmap allocations in apps that use a
pool of bitmaps and recycle them

Change-Id: I787455a5207bf90d6ed9f1622e0f7f7e1a4a6704
2013-02-04 16:40:25 +01:00
Derek Sollenberger
d0351a67f1 am 1bce2db3: Merge "Fix return type mismatch in Region\'s JNI code."
# Via Android (Google) Code Review (1) and Derek Sollenberger (1)
* commit '1bce2db3b4ac17156066646171c82731c87aa4d1':
  Fix return type mismatch in Region's JNI code.
2013-02-04 05:24:49 -08:00
Derek Sollenberger
250f8ef248 Fix return type mismatch in Region's JNI code.
bug: 7620006
Change-Id: Iddca9b3739b0c116a80a900e06cede338b868e17
2013-02-01 11:57:59 -05:00
Kenny Root
5a2cae1cb8 am 29449a3d: am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (3) and others
* commit '29449a3da7d859e8273612527949e0a200b8e798':
  One more fix for incorrect indices.
2013-01-29 23:04:39 -08:00
Kenny Root
29449a3da7 am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (2) and others
* commit '781bcd68ce7d701f5d36dd0d1b07d51ef937f0bc':
  One more fix for incorrect indices.
2013-01-29 23:01:51 -08:00
Kenny Root
c3ee1d9aea am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Gerrit Code Review (1) and Stephen Hines (1)
* commit '7ad885e2e6c845dbec4f16cd71e859240741dbf9':
  One more fix for incorrect indices.
2013-01-29 22:56:40 -08:00
Christopher Tate
0e1d11fc13 am 7b3b2cfc: am e93ca308: am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit '7b3b2cfc29081605a419c266227b88d9a27c37cb':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:47:26 -08:00
Christopher Tate
7b3b2cfc29 am e93ca308: am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit 'e93ca308c8792b231ec921ba8a00e6c78e87f9ad':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:45:50 -08:00
Christopher Tate
0e95685ff4 am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit 'b5a7204313447101ad80c0c6015e930f1e6b1013':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:39:55 -08:00
Stephen Hines
3983754bbb One more fix for incorrect indices.
Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3
2013-01-22 18:29:41 -08:00
Stephen Hines
0ce7cdaffd Fix array index oob in Matrix3f.loadRotate().
https://code.google.com/p/android/issues/detail?id=42860

Change-Id: Idbf18576da3ad5b84b4209147dad34cc2f9044d2
2013-01-22 16:01:44 -08:00
Derek Sollenberger
70336dd0eb Update enum value to match those in the native header.
Change-Id: Idfb921ecd138baa8570ac1e92bdeb291dbf9207e
2013-01-18 14:33:50 -05:00
Jason Sams
edd9f42499 am daa944a1: Merge "Add YUV allocation creation."
* commit 'daa944a167c3e7365ea6f9b6712950edd5ca2dd4':
  Add YUV allocation creation.
2013-01-09 15:35:25 -08:00
Jason Sams
6a6852cfcb am 16ad1770: Merge "Add 3D LUT intrinsic java class"
* commit '16ad17705eb22bb02a551cddd68f65b8addaa4d6':
  Add 3D LUT intrinsic java class
2013-01-08 18:00:47 -08:00
Jason Sams
b109cc7861 Add YUV allocation creation.
Change-Id: I0d1ff72f60481eb9c28cf058eab72e689494d14b
2013-01-08 15:29:41 -08:00
Jason Sams
40f1fa6ed6 Add 3D LUT intrinsic java class
Add test for 3D LUT

Change-Id: I52bc20fd5458afda6de0a6015e9c8bc6a4970055
2013-01-08 11:52:56 -08:00
Derek Sollenberger
fc615a0f64 Remove calls to SkCanvas::setBitmapDevice()
Change-Id: Ib0aa2f65b77802b105c0e8a9d7cdde2e863d3673
2013-01-08 10:00:54 -05:00
Jason Sams
cdb87536f5 am 18483a48: Merge "Cleanup imports."
* commit '18483a482a129276f462bbcccf9dbad21b29a4bd':
  Cleanup imports.
2013-01-02 16:18:48 -08:00
Jason Sams
232f4214cf am 256377e7: Merge "yuv"
* commit '256377e7469a6fbc930727a19ea4a00ca886d6dd':
  yuv
2013-01-02 16:14:06 -08:00
Jason Sams
ef308ed9b3 Cleanup imports.
Change-Id: I72690651e895ad7bafa57ccc7261eaa1168923bd
2013-01-02 11:20:29 -08:00
Jason Sams
8140d7b0f6 yuv
Change-Id: I3e99740250f1a3cb356bf6906528abc71f8cee2e
2013-01-02 11:20:29 -08:00