summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* Move most TransformationInfo properties to RenderNodeChris Craik2014-04-023-48/+48
| | | | | | | | | | | | | | | | This change dedupes the various properties that were represented both in TransformationInfo, and RenderProperties on the native side. RenderNode (and its associated properties) are now permanently attached to a View in SW or HW. The native copy of these properties are their sole representation. Alpha to come in a later CL. Also fixed issue with copying RenderNode's transform, and added support of deleting RenderNodes in software rendering. Change-Id: Ideb6e7f32b780e87aa1c32637c368356b3eee3a1
* am 3399ec31: am b386bfd7: am 89dddcc9: Merge "Use default visibility for ↵Ben Cheng2014-04-021-1/+1
|\ | | | | | | | | | | | | Snapshot::getLocalClip." * commit '3399ec317d8a318ca384036bc6fecf4656f1f118': Use default visibility for Snapshot::getLocalClip.
| * am b386bfd7: am 89dddcc9: Merge "Use default visibility for ↵Ben Cheng2014-04-021-1/+1
| |\ | | | | | | | | | | | | | | | | | | Snapshot::getLocalClip." * commit 'b386bfd791d77e24bcfe3261420f82b0a9d3851d': Use default visibility for Snapshot::getLocalClip.
| | * am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."Ben Cheng2014-04-021-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '89dddcc948cb3e826bfddeefae73066849aba0fc': Use default visibility for Snapshot::getLocalClip.
| | | * Use default visibility for Snapshot::getLocalClip.Ben Cheng2014-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method is in libhwui.so but used by libandroid_runtime.so (via android_view_GLES20Canvas.cpp). If the compiler decides not to inline this method, the linker won't be able to resolve the dependency when it has hidden visibility. The problem is found when testing GCC 4.9. Change-Id: I3b4d096c7767f0bef0796886dfb2c5ba2ecff48c
| * | | am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-devMichael Wright2014-04-021-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '4932a355f1594990173e0d9cd1fa38b8491c4a29': Misc. buttons aren't gamepad keys.
| | * \ \ Merge "Misc. buttons aren't gamepad keys." into klp-modular-devMichael Wright2014-04-021-4/+0
| | |\ \ \
| | | * | | Misc. buttons aren't gamepad keys.Michael Wright2014-04-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUTTON_[1-9] are intended to be misc. buttons so the kernel will assign them to non-gamepad devices. As such, we shouldn't treat them as belonging to gamepads at all. Bug: 13432364 Change-Id: I9495760f2379e44785b9ce1cf018b6db7f6cb0f4
| * | | | | am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-devMichael Wright2014-03-291-6/+27
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03': Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE Adds API for determining confirm and cancel keys.
| | * | | | Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGEMichael Wright2014-03-261-6/+27
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change MotionEvent.PointerCoords bit packing and unpacking methods to be consistent with BitSets which are now used on the native PointerCoords object. Bug: 11480300 Change-Id: Ib18c99b94ac555104c69eac526860aa501e89e03
* | | | | Add invokeFunctorJohn Reck2014-03-284-1/+34
| | | | | | | | | | | | | | | | | | | | Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
* | | | | Merge "Remove kStatusInvoke & kStatusDraw"John Reck2014-03-293-38/+3
|\ \ \ \ \
| * | | | | Remove kStatusInvoke & kStatusDrawJohn Reck2014-03-283-38/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are unused Change-Id: I44ecf1164dc6bc1b09438e733976d5a97a25f00e
* | | | | | Support shadows on the root RenderNodeChris Craik2014-03-285-76/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13211941 Cleans up some of the RenderNode method naming Also removes unnecessary clip/save/restores, clipping shadows predictably, as drawn by the parent, before drawing (and clipping, etc.) the shadow casting child. Change-Id: I795115e1fb869bbbdd7be43e279b97490fecc7e0
* | | | | | Merge "Disable shadow overdraw avoidance in the inverse clip case"Chris Craik2014-03-284-9/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Disable shadow overdraw avoidance in the inverse clip caseChris Craik2014-03-274-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The caster is effectivly transparent, so skip the optimization just as is done for alpha < 1.0 Change-Id: I3d294222adf0137e20c1fb5808313d487e92e0a8
* | | | | | Merge "Async drawing!"John Reck2014-03-2712-57/+294
|\ \ \ \ \ \
| * | | | | | Async drawing!John Reck2014-03-2712-57/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e728356f58af88174328a8c0b90d27b128bfe01
* | | | | | | resolved conflicts for merge of 22d07464 to masterNarayan Kamath2014-03-278-29/+32
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
| * | | | | resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-2711-41/+44
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
| | * | | | am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"Narayan Kamath2014-03-276-26/+29
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'cd3f60f30366a34b4499aab5a47b622069ba9cd6': AArch64: Make frameworks/base code more portable
| | | * | | AArch64: Make frameworks/base code more portableAshok Bhat2014-03-276-26/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Use %zu for size_t, %zd for ssize_t [x] 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: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | | Merge "Add private circular reveal API on View/RenderNode"Chris Craik2014-03-268-28/+193
|\ \ \ \ \ \
| * | | | | | Add private circular reveal API on View/RenderNodeChris Craik2014-03-258-28/+193
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: I139c8e12b354083149a665f6768f3f6931a8dd15
* | | | | | am 72cf99ab: am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three ↵Chris Craik2014-03-252-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory leaks related to PatchCache" * commit '72cf99abdb6648f9346b72e0ef6d4da3c4dc9d17': Solve three memory leaks related to PatchCache
| * \ \ \ \ \ am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three memory leaks ↵Chris Craik2014-03-252-2/+16
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related to PatchCache" * commit '7e55b35a603fe64e8db2c6050a1b778baaccd920': Solve three memory leaks related to PatchCache
| | * | | | | am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '4118480aabb4a7b332e289ebb71d2e4f9bc05d7e': Solve three memory leaks related to PatchCache
| | | * | | | am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | * commit '80470cdf6c6995f4afe8d5e2c4b6e898625173fb': Solve three memory leaks related to PatchCache
| | | | * | | Solve three memory leaks related to PatchCacheJens Gulin2014-03-252-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Patch can be fairly large, holding bitmap data, but is also frequently leaked which adds to the severity. The feature is used in many important processes such as Home, SystemUI and Chrome. The following leaks are solved: 1. The Patch itself was not always freed. PatchCache::removeDeferred() can mark patches to be cared for by PatchCache::clearGarbage(). But mCache.remove() would only destroy the container and the pointer, not the Patch object itself. 2. The vertices stored in the Patch at Patch::createMesh() would always leak. The empty/default destructor in Patch would not properly destroy "vertices" since it's just a pointer. 3. A BufferBlock that's added to the mFreeBlocks in PatchCache could leak. The leak happened when a patch later needed the entire free block, because the object was removed from the list but never deleted in PatchCache::setupMesh(). Change-Id: I41e60824479230b67426fc546d3dbff294c8891f
| * | | | | | am 11e0ead8: am 69e58e44: Merge "Add idc config option for handling key ↵Michael Wright2014-03-202-0/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repeats" into klp-modular-dev * commit '11e0ead8118d97d0e76a98065a4811fdb01b2db2': Add idc config option for handling key repeats
| | * | | | | am 69e58e44: Merge "Add idc config option for handling key repeats" into ↵Michael Wright2014-03-202-0/+11
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '69e58e446bc2a030ae423d650e60dbfe317331e6': Add idc config option for handling key repeats
| | | * | | | Merge "Add idc config option for handling key repeats" into klp-modular-devMichael Wright2014-03-202-0/+11
| | | |\ \ \ \
| | | | * | | | Add idc config option for handling key repeatsMichael Wright2014-03-172-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13285870 Change-Id: Iea2a5d03e29c86dcee5f99a25e48736ebc6dd913
| * | | | | | | am 4eefde23: am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection ↵Chris Craik2014-03-202-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offset caching - DO NOT MERGE" into klp-dev * commit '4eefde23de23a5e9145a634e843964f6f6eaa6bd': Fix projection offset caching - DO NOT MERGE
| | * | | | | | am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching ↵Chris Craik2014-03-202-1/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" into klp-dev * commit '29f00c9f35d8565bb3e6b8a2526cbb237db6446a': Fix projection offset caching - DO NOT MERGE
| | | * | | | | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT ↵Chris Craik2014-03-202-1/+3
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-dev * commit '7c9bd98a4bb0aa6954d5f612c197d03f309980f0': Fix projection offset caching - DO NOT MERGE
| | | | * | | | Fix projection offset caching - DO NOT MERGEChris Craik2014-03-192-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13214038 Because the caching of projection matrix didn't account for changes in the offset flag, the flag could be ignored. Now we use both to verify that the cached matrix can be used. Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd (cherry picked from commit d04a6b15f74035fd2068f34225825b55e94521f4)
| | | | * | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-064-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
* | | | | | | | Shared library resource supportAdam Lesinski2014-03-253-62/+344
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries can now export resources for applications to use. Exporting resources works the same way the framework exports resources, by defining the public symbols in res/values/public.xml. Building a shared library requires aapt to be invoked with the --shared-lib option. Shared libraries will be assigned a package ID of 0x00 at build-time. At runtime, all loaded shared libraries will be assigned a new package ID. Currently, shared libraries should not import other shared libraries, as those dependencies will not be loaded at runtime. At runtime, reflection is used to update the package ID of resource symbols in the shared library's R class file. The package name of the R class file is assumed to be the same as the shared library's package name declared in its manifest. This will be customizable in a future commit. See /tests/SharedLibrary/ for examples of a shared library and its client. Bug:12724178 Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
* | | | | | | Merge "Move where updateProperties is called"John Reck2014-03-255-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Move where updateProperties is calledJohn Reck2014-03-245-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27da448996019094c44487ce28c5689d098d6535
* | | | | | | | Merge "Add missing null check"John Reck2014-03-251-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing null checkJohn Reck2014-03-251-3/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13635394 mDisplayListData can be null, make sure to check for that before trying to walk through the children list in updateProperties Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d
* | | | | | | | Add back clobbered cleanupJohn Reck2014-03-241-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I418b612710850bbc3033c4bd0143fb0f0befd2cb
* | | | | | | Add stagingPropertiesJohn Reck2014-03-247-337/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7de551f8843fd70a77f738e33028e25c020bb3c
* | | | | | | Rework Outline API, remove isolatedZVolume remnantsChris Craik2014-03-244-32/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30c2fe832dcb98fa6329b1a595b3d3aafbdcad6b
* | | | | | | Merge "Early rejection on shadows which are outside of the clip bound."ztenghui2014-03-204-6/+52
|\ \ \ \ \ \ \
| * | | | | | | Early rejection on shadows which are outside of the clip bound.ztenghui2014-03-204-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the computations are estimated using bounding box. TODO: Spot shadow could have more accurate but also more expensive methods, we need more experiments to decide. Change-Id: I9c10c419576cee55daf0f9f278b0db78cb847447
* | | | | | | | Merge "Move RenderNode to own file"John Reck2014-03-199-673/+778
|\ \ \ \ \ \ \ \
| * | | | | | | | Move RenderNode to own fileJohn Reck2014-03-199-673/+778
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9380d161fd3ddd7b569c262dd8e7aa0c96151b1e