Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCach... | Chris Craik | 2014-05-19 | 2 | -1/+21 |
|\ | |||||
| * | am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" | Chris Craik | 2014-05-19 | 2 | -1/+21 |
| |\ | |||||
| | * | Use alpha channel instead of red in drawCachedGlyphBitmap | Digish Pandya | 2014-05-15 | 2 | -1/+21 |
* | | | am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a ... | Narayan Kamath | 2014-05-16 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
* | | | am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph b... | Chris Craik | 2014-05-09 | 1 | -5/+15 |
|\ \ \ | |/ / | |||||
| * | | am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" | Chris Craik | 2014-05-09 | 1 | -5/+15 |
| |\ \ | | |/ | |||||
| | * | Correct stride for drawing to cached glyph bitmap | Digish Pandya | 2014-05-09 | 1 | -5/+15 |
* | | | am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement on... | Chris Craik | 2014-05-05 | 1 | -20/+24 |
|\ \ \ | |/ / | |||||
| * | | am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init f... | Chris Craik | 2014-05-05 | 1 | -20/+24 |
| |\ \ | | |/ | |||||
| | * | Merge "libhwui: Handle the blurImage() implement once RS::init fail" | Chris Craik | 2014-05-05 | 1 | -20/+24 |
| | |\ | |||||
| | | * | libhwui: Handle the blurImage() implement once RS::init fail | Lu, Shenghua | 2014-04-25 | 1 | -20/+24 |
* | | | | am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindo... | Michael Wright | 2014-04-30 | 2 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD | Bill Yi | 2014-04-29 | 6 | -16/+20 |
| |\ \ \ | |||||
| | * \ \ | am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" | Chris Craik | 2014-03-25 | 2 | -2/+16 |
| | |\ \ \ | |||||
| | * | | | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-20 | 1 | -1/+1 |
| | * | | | | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE... | Chris Craik | 2014-03-20 | 2 | -1/+3 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" | Mark Salyzyn | 2014-03-19 | 6 | -98/+98 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." | Narayan Kamath | 2014-03-11 | 3 | -40/+40 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" | Narayan Kamath | 2014-03-11 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" | Chris Craik | 2014-03-11 | 4 | -15/+29 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" | Narayan Kamath | 2014-03-08 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa... | Narayan Kamath | 2014-03-07 | 2 | -7/+12 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" | Narayan Kamath | 2014-03-07 | 1 | -39/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." | Narayan Kamath | 2014-03-07 | 3 | -46/+114 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/count... | Narayan Kamath | 2014-03-07 | 3 | -45/+347 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl... | Leon Scroggins III | 2014-03-07 | 4 | -14/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp | Leon Scroggins III | 2014-03-06 | 4 | -14/+16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am df64ac68: ask skia to use flat gamma when rendering fonts from hwui | Victoria Lease | 2014-04-22 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | ask skia to use flat gamma when rendering fonts from hwui | Victoria Lease | 2014-04-22 | 2 | -2/+6 |
* | | | | | | | | | | | | | | | | | | | am f24687e2: Merge "Plumb display power state through display manager." into ... | Jeff Brown | 2014-04-11 | 3 | -47/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Plumb display power state through display manager. | Jeff Brown | 2014-04-10 | 3 | -47/+5 |
* | | | | | | | | | | | | | | | | | | | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp... | John Spurlock | 2014-04-04 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Introduce new UI_MODE_TYPE_WATCH and qualifier. | John Spurlock | 2014-04-04 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | | | | am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLoca... | Ben Cheng | 2014-04-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip." | Ben Cheng | 2014-04-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Use default visibility for Snapshot::getLocalClip. | Ben Cheng | 2014-04-02 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev | Michael Wright | 2014-04-02 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev | Michael Wright | 2014-04-02 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Misc. buttons aren't gamepad keys. | Michael Wright | 2014-04-01 | 1 | -4/+0 |
* | | | | | | | | | | | | | | | | | | | am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev | Michael Wright | 2014-03-29 | 1 | -6/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE | Michael Wright | 2014-03-26 | 1 | -6/+27 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp | Narayan Kamath | 2014-03-27 | 11 | -41/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable" | Narayan Kamath | 2014-03-27 | 6 | -26/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | AArch64: Make frameworks/base code more portable | Ashok Bhat | 2014-03-27 | 6 | -26/+29 |
* | | | | | | | | | | | | | | | | | am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" | Chris Craik | 2014-03-25 | 2 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | am 80470cdf: Merge "Solve three memory leaks related to PatchCache" | Chris Craik | 2014-03-25 | 2 | -2/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Solve three memory leaks related to PatchCache | Jens Gulin | 2014-03-25 | 2 | -2/+16 |
* | | | | | | | | | | | | | | | | am 69e58e44: Merge "Add idc config option for handling key repeats" into klp-... | Michael Wright | 2014-03-20 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge "Add idc config option for handling key repeats" into klp-modular-dev | Michael Wright | 2014-03-20 | 2 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Add idc config option for handling key repeats | Michael Wright | 2014-03-17 | 2 | -0/+11 |