summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing te...Elliott Hughes2015-01-131-1/+3
|\
| * am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISL...Elliott Hughes2015-01-131-1/+3
| |\
| | * Use more intention-revealing tests for S_ISLNK and S_ISSOCK.Elliott Hughes2015-01-121-1/+3
* | | Merge "Replace sleep() hack with vsync listening"John Reck2015-01-083-30/+83
|\ \ \
| * | | Replace sleep() hack with vsync listeningJohn Reck2015-01-063-30/+83
* | | | Merge frameworks/base changes from master-skia to master.Mike Reed2015-01-062-2/+2
|/ / /
* | | Add overrides and switch to nullptr keyword for all filesChris Craik2015-01-0560-544/+550
* | | Make DisplayListRenderer inherit from Canvas, merge JNITom Hudson2015-01-058-201/+329
* | | Cleanup various clang warnings, use unique_ptrs in several placesChris Craik2014-12-2330-226/+133
* | | Add overrides and switch to nullptr keywordChris Craik2014-12-2232-247/+262
* | | CleanupChris Craik2014-12-227-46/+19
* | | am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
|\ \ \ | |/ /
| * | am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
| |\ \
| | * | Tweak RT-animator schedulingJohn Reck2014-12-194-15/+22
* | | | Stop pretending USE_OPENGL_RENDERER is a thingJohn Reck2014-12-185-17/+7
* | | | Split hwui's makefileJohn Reck2014-12-183-134/+113
* | | | resolved conflicts for merge of fd461ede to masterChris Craik2014-12-173-8/+13
|\ \ \ \ | |/ / /
| * | | am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization chan...Chris Craik2014-12-173-8/+13
| |\ \ \ | | |/ /
| | * | Merge "Revert overdraw avoidance visualization change" into lmp-mr1-devChris Craik2014-12-173-8/+13
| | |\ \
| | | * | Revert overdraw avoidance visualization changeChris Craik2014-12-173-8/+13
| * | | | Fix styleJohn Reck2014-12-1221-175/+175
* | | | | am ec9b598c: am b9a4d15d: Merge "Force-flush state sync on texid change" into...John Reck2014-12-121-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-devJohn Reck2014-12-121-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "Force-flush state sync on texid change" into lmp-mr1-devJohn Reck2014-12-111-0/+6
| | |\ \ \
| | | * | | Force-flush state sync on texid changeJohn Reck2014-12-111-0/+6
* | | | | | am 3f454e7d: am 63c7b246: Merge "Correct layer size formatting in trace" into...Chris Craik2014-12-121-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-devChris Craik2014-12-121-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Correct layer size formatting in trace" into lmp-mr1-devChris Craik2014-12-111-2/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Correct layer size formatting in traceChris Craik2014-12-111-2/+2
| | | |/ /
* | | | | resolved conflicts for merge of d67bb501 to masterYohann Roussel2014-12-1111-73/+76
|\ \ \ \ \ | |/ / / /
| * | | | am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
| |\ \ \ \ | | |/ / /
| | * | | Merge "Don't preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
| | |\ \ \
| | | * | | Don't preload textures for AssetAtlasJohn Reck2014-12-1011-73/+75
| | | |/ /
* | | | | am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource at...Adam Lesinski2014-12-111-0/+17
|\ \ \ \ \ | |/ / / /
| * | | | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul...Adam Lesinski2014-12-111-0/+17
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix issue where non-resource attributes would cause obtainStyleAttribu...Adam Lesinski2014-12-101-0/+17
| | |\ \ \
| | | * | | Fix issue where non-resource attributes would cause obtainStyleAttributes to ...Adam Lesinski2014-12-101-0/+17
* | | | | | resolved conflicts for merge of 5369b769 to masterChris Craik2014-12-104-8/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp.Chris Craik2014-12-104-8/+19
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix frame-allocated path lifecyclesChris Craik2014-12-104-8/+19
| | | |/ / | | |/| |
* | | | | resolved conflicts for merge of 3bae94d7 to masterNick Kralevich2014-12-101-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aospJohn Reck2014-12-091-4/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "Teach AssetAtlas about more drawables" into lmp-mr1-devJohn Reck2014-12-091-2/+4
| | |\ \ \
| | | * | | Teach AssetAtlas about more drawablesJohn Reck2014-12-091-2/+4
| | | |/ /
* | | | | am 1f78b336: am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous re...Derek Sollenberger2014-12-091-8/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference count...Derek Sollenberger2014-12-091-8/+0
| |\ \ \ \ | | |/ / /
| | * | | Remove unnecessary/erroneous reference countingDerek Sollenberger2014-12-091-8/+0
| | |/ /
* | | | am e97908d3: Merge commit \'0953ab27\' into manualmergeAdam Lesinski2014-12-051-48/+57
|\ \ \ \ | |/ / /
| * | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-48/+57
| |\ \ \ | | |/ /
| | * | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-devAdam Lesinski2014-12-041-46/+57
| | |\ \