summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add special system view cookie to OverflowButton."Deepanshu Gupta2014-04-291-1/+28
|\
| * Add special system view cookie to OverflowButton.Deepanshu Gupta2014-04-251-1/+28
* | Merge "Child nodes of <preference-headers> now output proguard keep options."Adam Lesinski2014-04-251-7/+12
|\ \ | |/ |/|
| * Child nodes of <preference-headers> now output proguard keep options.Adam Lesinski2014-04-251-7/+12
* | Bug fix in layoutlibDeepanshu Gupta2014-04-232-5/+4
* | Fix style warnings in RenderSessionImplDeepanshu Gupta2014-04-231-47/+45
* | Add view cookies for action bar menus.Deepanshu Gupta2014-04-236-45/+251
* | Merge "Update Matrix_Delegate native methods."Deepanshu Gupta2014-04-221-124/+59
|\ \
| * | Update Matrix_Delegate native methods.Deepanshu Gupta2014-04-211-124/+59
| |/
* | am be06a418: am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods."Deepanshu Gupta2014-04-221-0/+10
|\ \ | |/ |/|
| * am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods."Deepanshu Gupta2014-04-221-0/+10
| |\
| | * Add missing ICU_Delegate methods.Deepanshu Gupta2014-04-211-0/+10
* | | am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recen...Elliott Hughes2014-04-181-1/+1
|\ \ \ | |/ /
| * | am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocal...Elliott Hughes2014-04-181-1/+1
| |\ \ | | |/
| | * Fix warning introduced by recent psuedolocalizer change.Elliott Hughes2014-04-181-1/+1
* | | Merge "Add DisplayManager service to BridgeContext"Deepanshu Gupta2014-04-181-0/+7
|\ \ \
| * | | Add DisplayManager service to BridgeContextDeepanshu Gupta2014-04-181-0/+7
* | | | Merge "Add isElegantHeight to Layoutlib"Deepanshu Gupta2014-04-181-0/+10
|\ \ \ \
| * | | | Add isElegantHeight to LayoutlibDeepanshu Gupta2014-04-181-0/+10
| |/ / /
* | | | resolved conflicts for merge of 56ca8219 to masterElliott Hughes2014-04-189-104/+335
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aospElliott Hughes2014-04-189-104/+335
| |\ \ | | |/
| | * Pseudolocalizer improvements.Anton Krumin2014-04-099-105/+336
| * | am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-devDeepanshu Gupta2014-04-163-5/+15
| |\ \
| | * \ resolved conflicts for merge of 0e2049cd to klp-modular-devDeepanshu Gupta2014-04-163-5/+15
| | |\ \
| | | * | Layoutlib tests now check methods return value [DO NOT MERGE]Deepanshu Gupta2014-04-153-5/+15
| * | | | resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aospDeepanshu Gupta2014-04-164-14/+150
| |\ \ \ \ | | |/ / /
| | * | | am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-164-14/+150
| | |\ \ \ | | | |/ /
| | | * | Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-154-14/+150
| * | | | am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in ...Deepanshu Gupta2014-04-166-93/+399
| |\ \ \ \ | | |/ / /
| | * | | am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO...Deepanshu Gupta2014-04-166-93/+399
| | |\ \ \ | | | |/ /
| | | * | Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-156-93/+399
| * | | | am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO ...Deepanshu Gupta2014-04-1610-145/+429
| |\ \ \ \ | | |/ / /
| | * | | am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-1610-145/+429
| | |\ \ \ | | | |/ /
| | | * | Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-1510-145/+429
| * | | | am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerD...Deepanshu Gupta2014-04-161-0/+1
| |\ \ \ \ | | |/ / /
| | * | | am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT...Deepanshu Gupta2014-04-161-0/+1
| | |\ \ \ | | | |/ /
| | | * | Support custom views using TimePickerDialog [DO NOT MERGE]Deepanshu Gupta2014-04-151-0/+1
* | | | | Merge "Add overflow menu popup for Action Bar in Layoutlib"Deepanshu Gupta2014-04-145-93/+385
|\ \ \ \ \
| * | | | | Add overflow menu popup for Action Bar in LayoutlibDeepanshu Gupta2014-04-145-93/+385
* | | | | | Merge "Action bar rendering in layoutlib"Deepanshu Gupta2014-04-1410-145/+429
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Action bar rendering in layoutlibDeepanshu Gupta2014-04-1010-145/+429
* | | | | | Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"Dan Sandler2014-04-141-2/+10
|\ \ \ \ \ \
| * \ \ \ \ \ am 79d88d13: am 73e78c75: am af42a91c: Fix another build breakage.Narayan Kamath2014-04-111-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of 90b39aba to master-lockscreen-devColin Cross2014-04-101-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 6be2f952 to master-lockscreen-devSvetoslav2014-04-101-10/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib"Deepanshu Gupta2014-04-101-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | am 733217e6: Merge "Update layoutlib create README"Deepanshu Gupta2014-04-091-138/+128
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 6e5e160f: Merge "Make layoutlib load on Java 7 VM"Deepanshu Gupta2014-04-092-1/+12
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 30f05c29: Merge "Fix sdk build."Ying Wang2014-04-081-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am e9abc279: Merge "Fix theme/style resolution in Layoutlib"Deepanshu Gupta2014-04-074-14/+145
| |\ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-23 23:48:37 +0000