summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add enter-animation-done callback for system windows" into lmp-mr1-devCraig Mautner2014-10-301-0/+4
|\
| * Add enter-animation-done callback for system windowsCraig Mautner2014-10-301-0/+4
* | am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater.Deepanshu Gupta2014-10-291-0/+8
|\ \
| * | Add missing delegate for AnimatorInflater.Deepanshu Gupta2014-10-281-0/+8
* | | am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-devDeepanshu Gupta2014-10-293-0/+104
|\ \ \ | |/ /
| * | Merge "Skip loading animations." into lmp-devDeepanshu Gupta2014-10-293-0/+104
| |\ \
| | * | Skip loading animations.Deepanshu Gupta2014-10-283-0/+104
* | | | am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolut...Deepanshu Gupta2014-10-293-15/+22
|\ \ \ \ | |/ / /
| * | | Merge "Fix multiple styles case in resource resolution." into lmp-devDeepanshu Gupta2014-10-293-15/+22
| |\ \ \
| | * | | Fix multiple styles case in resource resolution.Deepanshu Gupta2014-10-283-15/+22
* | | | | am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." int...Deepanshu Gupta2014-10-295-19/+43
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge "Use right theme for drawable inflation." into lmp-devDeepanshu Gupta2014-10-295-19/+43
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Use right theme for drawable inflation.Deepanshu Gupta2014-10-285-19/+43
* | | aapt updates for Android TVTim Kilbourn2014-10-241-1/+24
* | | Merge "First commit of split-select tool" into lmp-mr1-devAdam Lesinski2014-10-2319-7/+1850
|\ \ \
| * | | First commit of split-select toolAdam Lesinski2014-10-2319-7/+1850
* | | | am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automer...Deepanshu Gupta2014-10-224-37/+23
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Check Bridge init before disposing." into lmp-devDeepanshu Gupta2014-10-224-37/+23
| |\ \
| | * | Check Bridge init before disposing.Deepanshu Gupta2014-10-204-37/+23
| | |/
* | | am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources...Adam Lesinski2014-10-201-1/+4
|\ \ \ | |/ /
| * | AAPT: Fix path for final generated resources on WindowsAdam Lesinski2014-10-201-1/+4
* | | am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was...Adam Lesinski2014-10-171-1/+1
|\ \ \ | |/ /
| * | AAPT: Fix an issue where a resource name was incorrectly derived on WindowsAdam Lesinski2014-10-171-1/+1
* | | Minor resource notation/compatibility fixesAdam Lesinski2014-10-171-3/+3
* | | am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive strea...Jerome Dochez2014-10-104-0/+40
|\ \ \ | |/ /
| * | Merge "Added a daemon mode to aapt to receive streams of commands from gradle...Jerome Dochez2014-10-104-0/+40
| |\ \ | | |/ | |/|
| | * Added a daemon mode to aapt to receive streams of commands from gradle.Jerome Dochez2014-10-024-0/+40
* | | Track change to private libcore data structure.Elliott Hughes2014-10-091-1/+1
|/ /
* | am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
|\ \
| * | Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| * | LayoutLib: Use ICU's line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-082-0/+56
| * | Resource resolution bug fix. [DO NOT MERGE]Deepanshu Gupta2014-10-011-2/+1
| * | Fix Tests after cherry picks. [DO NOT MERGE]Deepanshu Gupta2014-10-012-5/+5
| * | Update intelliJ copyright profile [DO NOT MERGE]Deepanshu Gupta2014-10-011-1/+1
| * | Build layoutlib create tests as part of sdk build. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+3
| * | Add layoutlib tests to DIST_DIR [DO NOT MERGE]Deepanshu Gupta2014-10-012-0/+6
| * | Build layoutlib_create tests. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+32
| * | Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]Deepanshu Gupta2014-10-0113-23/+75
| * | Get filename from File faster [DO NOT MERGE]Deepanshu Gupta2014-10-011-9/+6
| * | Add testing framework to LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-10-0165-26/+1965
| * | Add tests to the layoutlib eclipse project. [DO NOT MERGE]Deepanshu Gupta2014-10-011-1/+3
| * | Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-251-2/+7
| * | Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modula...Deepanshu Gupta2014-09-041-0/+4
| |\ \
| | * | Resolve color xml attributes properly. [DO NOT MERGE]Deepanshu Gupta2014-08-261-0/+4
| * | | Fix "@null" resource values in LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-08-261-2/+3
| |/ /
* | | Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-devAdam Lesinski2014-10-031-20/+26
|\ \ \
| * | | AAPT: Gate v21 resource synthesizing logging behind -v flagAdam Lesinski2014-10-031-20/+26
| | |/ | |/|
* | | Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
|\ \ \ | |/ / |/| |
| * | Minor style changes.Deepanshu Gupta2014-10-021-3/+3
* | | Merge "Always resolve enum when resolving resources." into lmp-devDeepanshu Gupta2014-10-022-202/+110
|\ \ \ | |/ /