summaryrefslogtreecommitdiffstats
path: root/graphics/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik2013-02-133-33/+36
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | 'goog/master'" DO NOT MERGE"
| * | | | | Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik2013-02-133-33/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
* | | | | | Merge "Add rsnScriptForEachClipped() implementation with no param array."Stephen Hines2013-02-131-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add rsnScriptForEachClipped() implementation with no param array.Stephen Hines2013-02-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Clean Paint.mBidiFlags as it is no longer used"Fabrice Di Meglio2013-02-132-305/+49
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Clean Paint.mBidiFlags as it is no longer usedFabrice Di Meglio2013-02-122-305/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug #7623824 Change-Id: Ie2f9422821f6dcc73c99e8695f448e966b587b1d
* | | | | | Merge "Pass through null LaunchOption structs to standard forEach."Tim Murray2013-02-131-0/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Pass through null LaunchOption structs to standard forEach.Tim Murray2013-02-121-0/+5
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I4dcde6996400207c7e361ff4b7723ec7db832e80
* | | | | Merge "Check Element in all API levels for copy2DRangeFrom()."Stephen Hines2013-02-121-20/+4
|\ \ \ \ \
| * | | | | Check Element in all API levels for copy2DRangeFrom().Stephen Hines2013-02-081-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I561317671a16888fc9f35908ab1ae1489a14fc6c
* | | | | | Merge "Fix copyFrom() to use proper dimensions for copying."Stephen Hines2013-02-121-22/+91
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix copyFrom() to use proper dimensions for copying.Stephen Hines2013-02-081-22/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Add FieldPacker contructor that accepts external storage."Jason Sams2013-02-121-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add FieldPacker contructor that acceptsJason Sams2013-02-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external storage. Change-Id: I9c796f925802b202eae7e0fe1750a10140ef4a47
* | | | | | Merge "Deprecate useless BitmapDrawable constructor Bug #2590549"Romain Guy2013-02-082-2/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Deprecate useless BitmapDrawable constructorRomain Guy2013-02-082-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #2590549 Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
* | | | | | Add API entry points for clipped kernels.Tim Murray2013-02-072-6/+54
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Idf474a5ac391c41e9215cd2f03e7f8c4bfb875fa
* | | | | Merge "Implement rs.sendMessage()"Jason Sams2013-02-072-0/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Implement rs.sendMessage()Jason Sams2013-02-052-0/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib4f4bb7bb4f697d0b5405ad55721394ed2456c65
* | | | | am 11f1c5b8: am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge ↵Scott Main2013-02-067-7/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | "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
| * | | | am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix ↵Scott Main2013-02-067-7/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | am 00f49084: Merge "docs: fix renderscript links that currently require ↵Scott Main2013-02-067-7/+7
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | docs: fix renderscript links that currently require redirectScott Main2013-02-057-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
* | | | | Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"Derek Sollenberger2013-02-063-36/+33
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | am c24b1448: Merge "Don\'t mark recycled bitmaps as immutable"Michael Jurka2013-02-041-5/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Michael Jurka (1) * commit 'c24b14481527e2f87ddb3a156b8217d32c645b10': Don't mark recycled bitmaps as immutable
| * \ \ \ \ am 1bce2db3: Merge "Fix return type mismatch in Region\'s JNI code."Derek Sollenberger2013-02-041-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Derek Sollenberger (1) * commit '1bce2db3b4ac17156066646171c82731c87aa4d1': Fix return type mismatch in Region's JNI code.
| * \ \ \ \ \ am 29449a3d: am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for ↵Kenny Root2013-01-291-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrect indices." # By Stephen Hines # Via Android Git Automerger (3) and others * commit '29449a3da7d859e8273612527949e0a200b8e798': One more fix for incorrect indices.
| * \ \ \ \ \ \ am 7b3b2cfc: am e93ca308: am 0e95685f: am b5a72043: Merge "Fix array index ↵Christopher Tate2013-01-221-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oob in Matrix3f.loadRotate()." * commit '7b3b2cfc29081605a419c266227b88d9a27c37cb': Fix array index oob in Matrix3f.loadRotate().
| * | | | | | | | Update enum value to match those in the native header.Derek Sollenberger2013-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfb921ecd138baa8570ac1e92bdeb291dbf9207e
| * | | | | | | | am daa944a1: Merge "Add YUV allocation creation."Jason Sams2013-01-092-4/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daa944a167c3e7365ea6f9b6712950edd5ca2dd4': Add YUV allocation creation.
| * \ \ \ \ \ \ \ \ am 16ad1770: Merge "Add 3D LUT intrinsic java class"Jason Sams2013-01-081-0/+90
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16ad17705eb22bb02a551cddd68f65b8addaa4d6': Add 3D LUT intrinsic java class
| * | | | | | | | | | Remove calls to SkCanvas::setBitmapDevice()Derek Sollenberger2013-01-081-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0aa2f65b77802b105c0e8a9d7cdde2e863d3673
| * | | | | | | | | | am 18483a48: Merge "Cleanup imports."Jason Sams2013-01-024-11/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18483a482a129276f462bbcccf9dbad21b29a4bd': Cleanup imports.
| * \ \ \ \ \ \ \ \ \ \ am 256377e7: Merge "yuv"Jason Sams2013-01-022-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '256377e7469a6fbc930727a19ea4a00ca886d6dd': yuv
| * \ \ \ \ \ \ \ \ \ \ \ am 69bf687e: Merge "Add API support for 3D allocations."Jason Sams2012-12-281-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69bf687e5335db07d32fd68438ff64e18b9e9e8a': Add API support for 3D allocations.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 696a5e04: Merge "We can only optimize bitmaps that have USAGE_SHARED."Stephen Hines2012-12-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '696a5e04ea43ed601f2c21555e3c475e690a37a7': We can only optimize bitmaps that have USAGE_SHARED.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 0562a0dc: Merge "Add USAGE_SHARED for Allocations."Tim Murray2012-12-191-3/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0562a0dcc1bcbda59c753e659fbb2f9c3cd76869': Add USAGE_SHARED for Allocations.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Update framework to support r5967 of Skia." into master-chromiumDerek Sollenberger2012-12-192-23/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update framework to support r5967 of Skia.Derek Sollenberger2012-12-122-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 6906025 Change-Id: Iefdb830ec3aa2ab3472c1c142484a7aa21788a15
* | | | | | | | | | | | | | | | | Log non-fatal RS errors.Jason Sams2013-02-051-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e58b89453af8955ba9df825ec143e793890f44a
* | | | | | | | | | | | | | | | Merge "Don't mark recycled bitmaps as immutable"Michael Jurka2013-02-041-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Don't mark recycled bitmaps as immutableMichael Jurka2013-02-041-5/+7
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helps avoid Bitmap allocations in apps that use a pool of bitmaps and recycle them Change-Id: I787455a5207bf90d6ed9f1622e0f7f7e1a4a6704
* | | | | | | | | | | | | | | Fix return type mismatch in Region's JNI code.Derek Sollenberger2013-02-011-3/+3
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 7620006 Change-Id: Iddca9b3739b0c116a80a900e06cede338b868e17
* | | | | | | | | | | | | | am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect ↵Kenny Root2013-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indices." # By Stephen Hines # Via Android Git Automerger (2) and others * commit '781bcd68ce7d701f5d36dd0d1b07d51ef937f0bc': One more fix for incorrect indices.
| * | | | | | | | | | | | am 7ad885e2: Merge "One more fix for incorrect indices."Kenny Root2013-01-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Stephen Hines # Via Gerrit Code Review (1) and Stephen Hines (1) * commit '7ad885e2e6c845dbec4f16cd71e859240741dbf9': One more fix for incorrect indices.
| | * | | | | | | | | | | | One more fix for incorrect indices.Stephen Hines2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3
* | | | | | | | | | | | | | am e93ca308: am 0e95685f: am b5a72043: Merge "Fix array index oob in ↵Christopher Tate2013-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matrix3f.loadRotate()." * commit 'e93ca308c8792b231ec921ba8a00e6c78e87f9ad': Fix array index oob in Matrix3f.loadRotate().
| * | | | | | | | | | | | am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."Christopher Tate2013-01-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5a7204313447101ad80c0c6015e930f1e6b1013': Fix array index oob in Matrix3f.loadRotate().
| | * | | | | | | | | | | Fix array index oob in Matrix3f.loadRotate().Stephen Hines2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://code.google.com/p/android/issues/detail?id=42860 Change-Id: Idbf18576da3ad5b84b4209147dad34cc2f9044d2
* | | | | | | | | | | | | Add YUV allocation creation.Jason Sams2013-01-082-4/+33
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d1ff72f60481eb9c28cf058eab72e689494d14b