summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph b...Chris Craik2014-05-091-5/+15
|\
| * am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"Chris Craik2014-05-091-5/+15
| |\
| | * Correct stride for drawing to cached glyph bitmapDigish Pandya2014-05-091-5/+15
* | | am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement on...Chris Craik2014-05-051-20/+24
|\ \ \ | |/ /
| * | am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init f...Chris Craik2014-05-051-20/+24
| |\ \ | | |/
| | * Merge "libhwui: Handle the blurImage() implement once RS::init fail"Chris Craik2014-05-051-20/+24
| | |\
| | | * libhwui: Handle the blurImage() implement once RS::init failLu, Shenghua2014-04-251-20/+24
* | | | am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindo...Michael Wright2014-04-302-0/+2
|\ \ \ \ | |/ / /
| * | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-296-16/+20
| |\ \ \
| | * \ \ am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
| | |\ \ \
| | * | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-201-1/+1
| | * | | | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE...Chris Craik2014-03-202-1/+3
| | |\ \ \ \
| | * \ \ \ \ am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
| | |\ \ \ \ \
| | * \ \ \ \ \ am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-113-40/+40
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-03-111-4/+4
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-03-114-15/+29
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-03-082-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compa...Narayan Kamath2014-03-072-7/+12
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"Narayan Kamath2014-03-071-39/+36
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-03-073-46/+114
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/count...Narayan Kamath2014-03-073-45/+347
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl...Leon Scroggins III2014-03-074-14/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-064-14/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am df64ac68: ask skia to use flat gamma when rendering fonts from hwuiVictoria Lease2014-04-222-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | ask skia to use flat gamma when rendering fonts from hwuiVictoria Lease2014-04-222-2/+6
* | | | | | | | | | | | | | | | | | | am f24687e2: Merge "Plumb display power state through display manager." into ...Jeff Brown2014-04-113-47/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Plumb display power state through display manager.Jeff Brown2014-04-103-47/+5
* | | | | | | | | | | | | | | | | | | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...John Spurlock2014-04-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+3
* | | | | | | | | | | | | | | | | | | am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLoca...Ben Cheng2014-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."Ben Cheng2014-04-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Use default visibility for Snapshot::getLocalClip.Ben Cheng2014-04-021-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-devMichael Wright2014-04-021-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-devMichael Wright2014-03-291-6/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGEMichael Wright2014-03-261-6/+27
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-2711-41/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"Narayan Kamath2014-03-276-26/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | AArch64: Make frameworks/base code more portableAshok Bhat2014-03-276-26/+29
* | | | | | | | | | | | | | | | | am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Solve three memory leaks related to PatchCacheJens Gulin2014-03-252-2/+16
* | | | | | | | | | | | | | | | am 69e58e44: Merge "Add idc config option for handling key repeats" into klp-...Michael Wright2014-03-202-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching -...Chris Craik2014-03-202-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE...Chris Craik2014-03-202-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix projection offset caching - DO NOT MERGEChris Craik2014-03-192-1/+3
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-064-14/+16