summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge
Commit message (Expand)AuthorAgeFilesLines
* am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structu...Elliott Hughes2014-10-091-1/+1
|\
| * Track change to private libcore data structure.Elliott Hughes2014-10-081-1/+1
* | 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-023-140/+3
|\ \ \ | |/ / |/| / | |/
| * Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-013-140/+3
| * Optimize Blend composites.Deepanshu Gupta2014-07-071-147/+136
| * Add BlendComposite.javaDeepanshu Gupta2014-07-071-0/+772
| * Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-298-68/+196
| |\
| | * am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
| | |\
| | * \ resolved conflicts for merge of c76345a3 to klp-dev-plus-aospDeepanshu Gupta2014-03-122-4/+20
| | |\ \
| | * \ \ am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-03-111-5/+0
| | |\ \ \
| | * \ \ \ am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert...Narayan Kamath2014-03-061-4/+4
| | |\ \ \ \
| | * \ \ \ \ resolved conflicts for merge of cb7cdd50 to klp-dev-plus-aospBrian Carlstrom2014-03-063-3/+3
| | |\ \ \ \ \
* | | | | | | | 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
|/ / / / / / / /
* | | | | | | | Merge "Add layoutlib tests to DIST_DIR" into lmp-devDeepanshu Gupta2014-09-091-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add layoutlib tests to DIST_DIRDeepanshu Gupta2014-09-051-0/+3
* | | | | | | | | 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-042-6/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove ANDROID_BUILD_TOP from intelliJ path variables.Deepanshu Gupta2014-08-252-6/+58
* | | | | | | | | Merge "enums in dimension attributes." into lmp-devDeepanshu Gupta2014-09-041-13/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | enums in dimension attributes.Deepanshu Gupta2014-08-261-13/+18
* | | | | | | | | | Merge "Null out "@null" attributes." into lmp-devDeepanshu Gupta2014-09-041-42/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Null out "@null" attributes.Deepanshu Gupta2014-08-251-42/+26
| |/ / / / / / / /
* | | | | | | | | Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-devDeepanshu Gupta2014-09-041-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | LayoutLib: Fix warnings in ResourceHelper.Deepanshu Gupta2014-09-031-5/+7
* | | | | | | | | | Merge "LayoutLib: Allow '+' in float attributes." into lmp-devDeepanshu Gupta2014-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | LayoutLib: Allow '+' in float attributes.Deepanshu Gupta2014-09-031-1/+1
* | | | | | | | | | Merge "Fix invalid conditional check." into lmp-devDeepanshu Gupta2014-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix invalid conditional check.Deepanshu Gupta2014-08-261-1/+1
| |/ / / / / / / /
* | | | | | | | | Multiple performance changes to speed recents invocation/app launching time. ...Winson Chung2014-08-251-0/+6
|/ / / / / / / /
* | | | | | | | Fix "@null" resource values in LayoutLib.Deepanshu Gupta2014-08-191-2/+3
* | | | | | | | Add time to status bar and fix wifi icon.Deepanshu Gupta2014-08-189-29/+146
* | | | | | | | am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-186-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 32faabbe: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| * | | | | | | | | am 6ebeefa0: am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e:...Deepanshu Gupta2014-08-062-48/+106
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2:...Deepanshu Gupta2014-08-062-48/+106
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b:...Deepanshu Gupta2014-08-062-48/+106
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved con...Deepanshu Gupta2014-08-062-48/+106
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for me...Deepanshu Gupta2014-08-062-48/+106
| | | | | |\ \ \ \ \ \ \ \