| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of 1cbea39f to master | Nick Kralevich | 2014-02-12 | 2 | -172/+218 |
| |\ | |||||
| | * | resolved conflicts for merge of dd3d95f1 to klp-volantis-dev | Nick Kralevich | 2014-02-12 | 2 | -172/+218 |
| | |\ | |||||
| | | * | resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp | Nick Kralevich | 2014-02-12 | 2 | -172/+218 |
| | | |\ | |||||
| | | | * | Merge "Runtime resource overlay, iteration 2" | Dianne Hackborn | 2014-02-11 | 2 | -172/+218 |
| | | | |\ | |||||
| | | | | * | Runtime resource overlay, iteration 2 | Mårten Kongstad | 2014-02-03 | 2 | -172/+218 |
| | * | | | | am be83e4a0: am 38f96e50: Add support for injecting events into ActivityConta... | Jeff Brown | 2014-02-12 | 3 | -91/+147 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | am 38f96e50: Add support for injecting events into ActivityContainers. (DO NO... | Jeff Brown | 2014-02-12 | 3 | -91/+147 |
| | | |\ \ \ | |||||
| | | | * | | | Add support for injecting events into ActivityContainers. (DO NOT MERGE) | Jeff Brown | 2014-02-11 | 3 | -91/+147 |
| | * | | | | | Fix build. | Dianne Hackborn | 2014-02-11 | 1 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | Merge "Revert "Refactor setting an SkPaint onto a hwui Layer."" | Derek Sollenberger | 2014-02-12 | 5 | -13/+18 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Refactor setting an SkPaint onto a hwui Layer." | Derek Sollenberger | 2014-02-12 | 5 | -13/+18 |
| * | | | | | | Merge "Refactor setting an SkPaint onto a hwui Layer." | Derek Sollenberger | 2014-02-12 | 5 | -18/+13 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Refactor setting an SkPaint onto a hwui Layer. | Derek Sollenberger | 2014-02-12 | 5 | -18/+13 |
| * | | | | | | Fix build. | Dianne Hackborn | 2014-02-11 | 1 | -2/+2 |
| * | | | | | | am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'" | Dianne Hackborn | 2014-02-11 | 2 | -1/+26 |
| |\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| | * | | | | am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'" | Dianne Hackborn | 2014-02-11 | 2 | -1/+26 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Merge "New command line tool 'idmap'" | Dianne Hackborn | 2014-02-11 | 2 | -1/+26 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | New command line tool 'idmap' | Mårten Kongstad | 2014-02-03 | 2 | -1/+26 |
| * | | | | | Merge "Move inputservice over to frameworks/native" | Michael Wright | 2014-02-11 | 19 | -22538/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move inputservice over to frameworks/native | Michael Wright | 2014-02-11 | 19 | -22538/+6 |
| * | | | | | | Implement missing safelyRun() on ThreadedRenderer | John Reck | 2014-02-11 | 4 | -0/+26 |
| * | | | | | | Merge "Refactor HardwareLayer" | John Reck | 2014-02-11 | 5 | -7/+280 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Refactor HardwareLayer | John Reck | 2014-02-10 | 5 | -7/+280 |
| * | | | | | | | am deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic ... | Narayan Kamath | 2014-02-11 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| | * | | | | | am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type ins... | Narayan Kamath | 2014-02-11 | 1 | -4/+2 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | | Fix TinyHashMap to use generic hash_type instead of hash_t | Ashok Bhat | 2014-02-07 | 1 | -4/+2 |
| * | | | | | | Merge "Revert "Move inputservice over to frameworks/native"" | Michael Wright | 2014-02-10 | 16 | -6/+17144 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| | * | | | | | Revert "Move inputservice over to frameworks/native" | Michael Wright | 2014-02-10 | 16 | -6/+17144 |
| * | | | | | | Merge "Move inputservice over to frameworks/native" | Michael Wright | 2014-02-10 | 16 | -17144/+6 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Move inputservice over to frameworks/native | Michael Wright | 2014-02-10 | 16 | -17144/+6 |
| * | | | | | | Merge "Remove SkRegion dependency from libinput" | Michael Wright | 2014-02-10 | 3 | -8/+21 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Remove SkRegion dependency from libinput | Michael Wright | 2014-02-10 | 3 | -8/+21 |
| * | | | | | | Merge "Removing SkiaColorFilter and inspecting the native object directly." | Derek Sollenberger | 2014-02-10 | 19 | -621/+230 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Removing SkiaColorFilter and inspecting the native object directly. | Derek Sollenberger | 2014-02-07 | 19 | -621/+230 |
| * | | | | | | | Merge "Add shadow casting / global perspective APIs, hidden for now." | Chris Craik | 2014-02-10 | 2 | -7/+16 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add shadow casting / global perspective APIs, hidden for now. | Chris Craik | 2014-02-07 | 2 | -7/+16 |
| * | | | | | | | | Extended locales in AAPT / AssetManager. | Narayan Kamath | 2014-02-10 | 3 | -46/+114 |
| * | | | | | | | | AssetManager support for 3 letter lang/country codes. | Narayan Kamath | 2014-02-10 | 3 | -45/+347 |
| |/ / / / / / / | |||||
| * | | | | | | | Add the clipToOutline by just using the clipPathOp | ztenghui | 2014-02-07 | 2 | -0/+10 |
| |/ / / / / / | |||||
| * | | | | | | Merge "Keep the SkPaint used when creating a layer." | Derek Sollenberger | 2014-02-07 | 7 | -54/+39 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Keep the SkPaint used when creating a layer. | Derek Sollenberger | 2014-02-07 | 7 | -54/+39 |
| * | | | | | | | Merge "Rework and clean up DisplayList projection" | Chris Craik | 2014-02-07 | 6 | -48/+59 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Rework and clean up DisplayList projection | Chris Craik | 2014-02-06 | 6 | -48/+59 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge "Simplify DisplayList matrices" | Chris Craik | 2014-02-06 | 4 | -52/+66 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Simplify DisplayList matrices | Chris Craik | 2014-02-05 | 4 | -52/+66 |
| | |/ / / / / | |||||
| * | | | | | | am 2c764b20: am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs w... | Chris Craik | 2014-02-05 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| | * | | | | am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap" | Chris Craik | 2014-02-05 | 1 | -3/+3 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge "Fix for positioning of glyphs within a bitmap" | Chris Craik | 2014-02-05 | 1 | -3/+3 |
| | | |\ \ \ | | | |/ / | | |/| | | |||||
| | | | * | | Fix for positioning of glyphs within a bitmap | Alexander Toresson | 2014-01-23 | 1 | -3/+3 |
| | * | | | | am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." | Narayan Kamath | 2014-01-31 | 2 | -17/+17 |
| | |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |