summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/create
Commit message (Expand)AuthorAgeFilesLines
* Split up android.policy into framework.jar and services.jar 1/3Jorim Jaggi2015-02-101-1/+0
* am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
|\
| * Replace java.util.LinkedHashMap.eldest()Deepanshu Gupta2015-01-073-2/+68
* | resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp againDeepanshu Gupta2015-01-061-1/+0
|/
* am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-devDeepanshu Gupta2015-01-061-1/+0
|\
| * Remove Time from CreateInfoDeepanshu Gupta2015-01-021-1/+0
* | am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" i...Deepanshu Gupta2015-01-061-1/+0
|\ \ | |/
| * Fix default initial value for preferencesDeepanshu Gupta2014-12-231-1/+0
* | am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-devDeepanshu Gupta2015-01-062-0/+4
|\ \ | |/
| * Add preferences rendering.Deepanshu Gupta2014-12-232-0/+4
* | resolved conflicts for a0bc2e7e to lmp-mr1-devDeepanshu Gupta2014-12-301-0/+1
* | am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-devDeepanshu Gupta2014-12-043-31/+99
|\ \ | |/
| * Fix AnalogClock renderingDeepanshu Gupta2014-11-263-31/+99
| * LayoutLib: Stub AM/PM keycodes in Time Picker.Deepanshu Gupta2014-11-181-0/+1
|/
* Don't skip loading object animator.Deepanshu Gupta2014-11-111-0/+1
* Add primitive shadows support to LayoutLibDeepanshu Gupta2014-11-071-0/+5
* Merge "Skip loading animations." into lmp-devDeepanshu Gupta2014-10-291-0/+1
|\
| * Skip loading animations.Deepanshu Gupta2014-10-281-0/+1
* | Fix multiple styles case in resource resolution.Deepanshu Gupta2014-10-281-1/+0
|/
* 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-081-0/+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-011-0/+3
| * Build layoutlib_create tests. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+32
| * Add testing framework to LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+18
| * am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2:...Deepanshu Gupta2014-08-061-1/+1
| |\
| | * am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b:...Deepanshu Gupta2014-08-061-1/+1
| | |\
| | | * am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved con...Deepanshu Gupta2014-08-061-1/+1
| | | |\
| | | | * am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for me...Deepanshu Gupta2014-08-061-1/+1
| | | | |\
| | | | | * am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docsDeepanshu Gupta2014-08-061-1/+1
| | | | | |\
| | | | | | * resolved conflicts for merge of a232a68d to jb-mr1.1-docsDeepanshu Gupta2014-08-061-1/+1
| | | | | | |\
| | | | | | | * resolved conflicts for merge of 5476cfee to jb-mr1-devDeepanshu Gupta2014-08-061-1/+1
| | | | | | | |\
| | | | | | | | * am 505c675c: Fix SystemProperties in LayoutLib.Deepanshu Gupta2014-08-061-1/+1
| | | | | | | | |\
| | | | | | | | | * Fix SystemProperties in LayoutLib.Deepanshu Gupta2014-08-051-1/+1
| | | | | | * | | | am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correct...Deepanshu Gupta2014-05-131-1/+1
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-d...Deepanshu Gupta2014-05-131-1/+1
| | | | | | | |\ \ \ | | | | | | | | |/ /
| | | | | | | | * | Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aospDeepanshu Gupta2014-05-131-1/+1
| | | | | | | | |\ \
| | | | | | | | | * | resolve conflicts for merge 5a7b3b65 correctlyDeepanshu Gupta2014-05-121-1/+1
| | | | | | * | | | | am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus....Deepanshu Gupta2014-05-131-0/+2
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+2
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+2
| | | | | | | | |\ \ \ | | | | | | | | | | |/ | | | | | | | | | |/|
| | | | | | | | | * | Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-05-071-0/+2
| | | | | | * | | | | am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-devDeepanshu Gupta2014-05-131-0/+1
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | resolved conflicts for merge of 6d3c4ab2 to jb-mr1-devDeepanshu Gupta2014-05-131-0/+1
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+1
| | | | | | | | |\ \ \ | | | | | | | | | |/ /
| | | | | | | | | * | Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-061-0/+1
| | | | | | * | | | | am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutli...Deepanshu Gupta2014-05-131-0/+3
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+3
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+3
| | | | | | | | |\ \ \ | | | | | | | | | |/ /
generated by cgit v1.1 at 2024-12-25 20:36:36 +0000