summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge "Get rid of useless code"ztenghui2014-03-191-6/+1
|\ \ \
| * | | Get rid of useless codeztenghui2014-03-181-6/+1
| | | | | | | | | | | | | | | | Change-Id: I7fedd0df349e1d9408d58edcab25396e2ff2edd6
* | | | am 9ca25502: am 48250e14: am 9a09a523: am 0b472ae1: Merge "androidfw: ↵Mark Salyzyn2014-03-196-98/+98
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | resolve 64-bit build issues" * commit '9ca25502c05854288733ee5142e8bf6594821f83': androidfw: resolve 64-bit build issues
| * | | am 48250e14: am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit ↵Mark Salyzyn2014-03-196-98/+98
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build issues" * commit '48250e141dc738578f6957f86ac841f3cb522057': androidfw: resolve 64-bit build issues
| | * \ \ am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a09a5236529962afbaba9893e5eaf72bd6621b4': androidfw: resolve 64-bit build issues
| | | * \ \ am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b472ae13d38dd166a1a35782e028ade85bf2975': androidfw: resolve 64-bit build issues
| | | | * | | androidfw: resolve 64-bit build issuesMark Salyzyn2014-03-196-98/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - uid_t/gid_t cast to unsigned long - unused argument warnings - tab and space requirements Change-Id: Ib446d8165b9082be02edb55e6b71fd1a03ea3431
| * | | | | | am 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-174-14/+16
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '96978ee290ea0ef666c49ffa8733a8c74304c9f1': Update framework to use M33 Skia. DO NOT MERGE
| | * | | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-174-14/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6': Update framework to use M33 Skia. DO NOT MERGE
| | | * | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-174-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 Conflicts: core/jni/android/graphics/Bitmap.cpp core/jni/android/graphics/Graphics.cpp core/jni/android/graphics/Typeface.cpp graphics/java/android/graphics/Bitmap.java
| * | | | | | | am f80f60ba: am d23d916e: Merge "Controllers must have buttons and a ↵Michael Wright2014-03-131-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | movement mechanism." into klp-modular-dev * commit 'f80f60ba2b61df9f9544fcae8d8bdbe5542269fc': Controllers must have buttons and a movement mechanism.
| | * | | | | | am d23d916e: Merge "Controllers must have buttons and a movement mechanism." ↵Michael Wright2014-03-131-1/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'd23d916e0fc573ccde8a622aaa42ccfae9d31f82': Controllers must have buttons and a movement mechanism.
| | | * | | | | Merge "Controllers must have buttons and a movement mechanism." into ↵Michael Wright2014-03-131-1/+2
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev
| | | | * | | | | Controllers must have buttons and a movement mechanism.Michael Wright2014-03-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices have joystick axes or DPad keys, but no gamepad buttons (or vice versa). We shouldn't count these as gamepads since games can't really be expected to work with this setup in the general case. Instead, require that a device has a movement mechanism (joystick axes or DPad buttons), as well as at least one gamepad button before considering it a controller. Bug: 13432364 Change-Id: Ia113c8441557d4c858c1e5740a3e1c7e0e9fdcdd
| * | | | | | | | am 306c4688: am ca9eef62: b/12068020 Make kb layouts only unique to ↵RoboErik2014-03-123-3/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor/product. Do not merge * commit '306c46884eb3121a981a0d1ed0c5461908c227fc': b/12068020 Make kb layouts only unique to vendor/product. Do not merge
| | * | | | | | | am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do ↵RoboErik2014-03-123-3/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not merge * commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd': b/12068020 Make kb layouts only unique to vendor/product. Do not merge
| | | * | | | | | b/12068020 Make kb layouts only unique to vendor/product. Do not mergeRoboErik2014-03-123-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/ Instead of storing a kb layout per device descriptor (which is expected to be unique), store it for each vendor/product. This way we can keep a consistent layout between identical but physically different keyboards. There are some corner cases this is expected to fail on, namely devices that incorrectly have the same vendor/product id. Devices that don't define a vendor/product id will continue to use the descriptor to store layout files. Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
| * | | | | | | | am 840af707: am c1e0015e: b/12068020 Add a way to add uniqueness to device ↵RoboErik2014-03-122-2/+66
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | descriptors. Do not merge * commit '840af707b38cf2177cf546e460899fa2d3da335a': b/12068020 Add a way to add uniqueness to device descriptors. Do not merge
| | * | | | | | | am c1e0015e: b/12068020 Add a way to add uniqueness to device descriptors. ↵RoboErik2014-03-122-2/+66
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not merge * commit 'c1e0015ec3dfacc137cb500066020b25f18ecbb7': b/12068020 Add a way to add uniqueness to device descriptors. Do not merge
| | | * | | | | | b/12068020 Add a way to add uniqueness to device descriptors. Do not mergeRoboErik2014-03-122-2/+66
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from https://googleplex-android-review.git.corp.google.com/#/c/398226/ This adds an integer to the descriptor of devices without uniqely identifying information. It will reuse values that are no longer in use, so if you remove a single device and attach a different identical device it will appear to be the same device. TODO: Derive uniqueness from USB port when possible. This version will generate different descriptors for each half of a USB keyboard that shows up twice. Change-Id: Ie628f19c01469f6ec2d354cd00000898ac6432fa
| * | | | | | | am a54f852d: am ed28fc89: Utilize new Android LED constants. DO NOT MERGEMichael Wright2014-03-113-10/+43
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a54f852d3df7ac2e245ccffe8409b217330e5092': Utilize new Android LED constants. DO NOT MERGE
| | * | | | | | am ed28fc89: Utilize new Android LED constants. DO NOT MERGEMichael Wright2014-03-113-10/+43
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed28fc89e3085a88c6bd8b4269988150f3eceb56': Utilize new Android LED constants. DO NOT MERGE
| | | * | | | | Utilize new Android LED constants. DO NOT MERGEMichael Wright2014-03-113-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, have EventHub manage game controllers' player LEDs Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
* | | | | | | | Merge "Fix functor removal"John Reck2014-03-181-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix functor removalJohn Reck2014-03-181-0/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12179257 Change-Id: Ib63a351b1b289b08452f17086cb6c8b688e2ba4d
* | | | | | | | Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"ztenghui2014-03-171-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix the missing spot shadow when DEBUG_SHADOW is turned onztenghui2014-03-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current design, this error should be tolerated since the delta should be small enough. So we should not return here. Change-Id: I251db2882b331d37ae7f0896e9aa95d69a5650da
* | | | | | | | Merge "Create one hole inside the umbra area to avoid overdraw."ztenghui2014-03-179-140/+215
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Create one hole inside the umbra area to avoid overdraw.ztenghui2014-03-179-140/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13439450 Change-Id: I859575196bd5a3029f447883025a6ec3a1f1face
* | | | | | | Remove castsShadow and globalCamera APIsChris Craik2014-03-173-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60
* | | | | | | Revert "Remove castsShadow and globalCamera APIs"Chris Craik2014-03-173-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0334c314a5721f49b4d172a9cefe10f157cb28a4. Change-Id: I64714d17fb877e1b43c65eb44820d1128281c7a2
* | | | | | | Remove castsShadow and globalCamera APIsChris Craik2014-03-173-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d81a7849eba60a1a9debce74eedd55d6331842d
* | | | | | | Split out RenderPropertiesJohn Reck2014-03-125-583/+675
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia9888b4fb2c849d95a8c395cafef2e2294a23aae
* | | | | | No-op isolatedZVolumen propertyJohn Reck2014-03-122-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7aa474d65a3d12efd4ffb731e07ee42f4d348183
* | | | | | Merge "Rename DisplayList->RenderNode"John Reck2014-03-1218-65/+65
|\ \ \ \ \ \
| * | | | | | Rename DisplayList->RenderNodeJohn Reck2014-03-1218-65/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id42e23c9a1a6eb6eaeafef707ced7fa6887b03d0
* | | | | | | Force shadow casters above the Z=0 planeChris Craik2014-03-123-5/+13
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ifee75414829d4bfb3c7aa6219f1f9bcfd50ff0c6
* | | | | | Fix orthographic shadows projection, simplify shadow reorderingChris Craik2014-03-129-85/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate matrix passed to shadow system into two parts, one for transforming the polygon XY points (using the actual draw matrix) and a separate one which respects correct 4x4 3d rotations and translations for determining Z values. Change-Id: I7e30a84774a8709df6b2241e8f51fc5583648fe8
* | | | | | Remove experimental perspective projectionChris Craik2014-03-116-159/+23
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad688c8395ccd4673cc129973802b5f01dfb45ba
* | | | | | Improve shadow tessellation performanceChris Craik2014-03-117-177/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tune and simplify shadow parameters - Remove additional inner rings - Improve polygon ray casting algorithm Change-Id: If0f28b2d66ae0480b675942bb65e8fcd2864425d
* | | | | | DisplayList lifecycle changesJohn Reck2014-03-104-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13360343 Change DisplayList to be more forgiving with weaker lifecycle requirements. Is more self-managed with a strong reference to the renderer it needs Also fix naming mismatch Change-Id: I5c89453a72a52954f6f959f0846199705dbb6476
* | | | | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-103-40/+40
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
| * | | | | am 8272c84c: am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches ↵Narayan Kamath2014-03-103-40/+40
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | architecture agnostic." * commit '8272c84cb531a4f148f0b0a31d8359d381137378': LP64: Make 9 patches architecture agnostic.
generated by cgit v1.1 at 2025-02-05 11:48:33 +0000