summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
Commit message (Expand)AuthorAgeFilesLines
* am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structu...Elliott Hughes2014-10-091-1/+1
|\
| * am ae1b6805: Merge "Track change to private libcore data structure."Elliott Hughes2014-10-091-1/+1
| |\
| | * Track change to private libcore data structure.Elliott Hughes2014-10-081-1/+1
* | | am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
|\ \ \
| * \ \ 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
| | |/ / /
* | | | | am c74a2b34: Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Minor style changes.Deepanshu Gupta2014-10-021-3/+3
* | | | | resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-024-141/+3
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"Neil Fuller2014-10-024-141/+3
| |\ \ \ | | | |/ | | |/|
| | * | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-014-141/+3
| * | | am 7b97e426: Merge "Optimize Blend composites."Deepanshu Gupta2014-07-151-147/+136
| |\ \ \ | | |/ /
| | * | Optimize Blend composites.Deepanshu Gupta2014-07-071-147/+136
| * | | am e147445a: Merge "Add BlendComposite.java"Deepanshu Gupta2014-07-151-0/+772
| |\ \ \ | | |/ /
| | * | Add BlendComposite.javaDeepanshu Gupta2014-07-071-0/+772
* | | | Always resolve enum when resolving resources.Deepanshu Gupta2014-09-292-202/+110
* | | | Update time in layout previewDeepanshu Gupta2014-09-291-2/+1
* | | | Merge "Build LayoutLib tests with Java 6" into lmp-devDeepanshu Gupta2014-09-161-1/+1
|\ \ \ \
| * | | | Build LayoutLib tests with Java 6Deepanshu Gupta2014-09-161-1/+1
* | | | | Saver: PowerManager call to set low power mode.John Spurlock2014-09-141-0/+5
* | | | | Merge "LayoutLib: support font weights." into lmp-devDeepanshu Gupta2014-09-113-60/+166
|\ \ \ \ \ | |/ / / /
| * | | | LayoutLib: support font weights.Deepanshu Gupta2014-09-103-60/+166
* | | | | Fix build.Dianne Hackborn2014-09-091-0/+5
* | | | | Build layoutlib create tests as part of sdk build.Deepanshu Gupta2014-09-081-0/+3
|/ / / /
* | | | Merge "Update IntelliJ project file for IntelliJ 14" into lmp-devDeepanshu Gupta2014-09-091-1/+1
|\ \ \ \
| * | | | Update IntelliJ project file for IntelliJ 14Deepanshu Gupta2014-09-081-1/+1
* | | | | Merge "Add layoutlib tests to DIST_DIR" into lmp-devDeepanshu Gupta2014-09-092-0/+6
|\ \ \ \ \
| * | | | | Add layoutlib tests to DIST_DIRDeepanshu Gupta2014-09-052-0/+6
| |/ / / /
* | | | | Merge "Remove warning for null entries in resource array." into lmp-devDeepanshu Gupta2014-09-091-5/+0
|\ \ \ \ \
| * | | | | Remove warning for null entries in resource array.Deepanshu Gupta2014-09-041-5/+0
| |/ / / /
* | | | | Removing unnecessary delays, ensuring transition thumbnail is the size of the...Winson Chung2014-09-071-1/+2
|/ / / /
* | | | Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-devDeepanshu Gupta2014-09-0413-23/+75
|\ \ \ \
| * | | | Remove ANDROID_BUILD_TOP from intelliJ path variables.Deepanshu Gupta2014-08-2513-23/+75
* | | | | Merge "enums in dimension attributes." into lmp-devDeepanshu Gupta2014-09-041-13/+18
|\ \ \ \ \
| * | | | | enums in dimension attributes.Deepanshu Gupta2014-08-261-13/+18