summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | androidfw: resolve 64-bit build issuesMark Salyzyn2014-03-196-98/+98
* | | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-174-14/+16
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-174-14/+16
* | | | | am d23d916e: Merge "Controllers must have buttons and a movement mechanism." ...Michael Wright2014-03-131-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Controllers must have buttons and a movement mechanism." into klp-modu...Michael Wright2014-03-131-1/+2
| |\ \ \ \
| | * | | | Controllers must have buttons and a movement mechanism.Michael Wright2014-03-121-1/+2
* | | | | | am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not...RoboErik2014-03-123-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | b/12068020 Make kb layouts only unique to vendor/product. Do not mergeRoboErik2014-03-123-3/+4
* | | | | | am c1e0015e: b/12068020 Add a way to add uniqueness to device descriptors. Do...RoboErik2014-03-122-2/+66
|\ \ \ \ \ \ | |/ / / / /
| * | | | | b/12068020 Add a way to add uniqueness to device descriptors. Do not mergeRoboErik2014-03-122-2/+66
| |/ / / /
* | | | | am ed28fc89: Utilize new Android LED constants. DO NOT MERGEMichael Wright2014-03-113-10/+43
|\ \ \ \ \ | |/ / / /
| * | | | Utilize new Android LED constants. DO NOT MERGEMichael Wright2014-03-113-10/+43
* | | | | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-103-40/+40
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-103-40/+40
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-103-40/+40
* | | | | am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-281-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-281-4/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-281-4/+4
| | |\ \ \
| | | * | | Various format string fixes for 64bitKévin PETIT2014-02-241-4/+4
| | * | | | Fix AOSP build - DO NOT MERGEChris Craik2014-02-261-1/+1
| |/ / / /
* | | | | am 6ca90042: Add touch.wake IDC property to control wakeup.Jeff Brown2014-02-272-5/+10
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add touch.wake IDC property to control wakeup.Jeff Brown2014-02-262-5/+10
* | | | | am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-02-264-15/+29
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix graphics corruption caused by HWUI cachesSangkyu Lee2014-02-264-15/+29
| | |/ / | |/| |
* | | | am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
|\ \ \ \ | |/ / /