summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Include Shapes in LayoutLib." into mnc-devDeepanshu Gupta2015-05-261-3/+1
|\
| * Include Shapes in LayoutLib.Deepanshu Gupta2015-05-261-3/+1
* | Merge "LayoutLib: Support getting resource arrays." into mnc-devDeepanshu Gupta2015-05-2622-14/+245
|\ \
| * | LayoutLib: Support getting resource arrays.Deepanshu Gupta2015-05-2622-14/+245
* | | Merge "LayoutLib: Change nullity annotations." into mnc-devDeepanshu Gupta2015-05-2636-53/+57
|\ \ \ | |/ / | | / | |/ |/|
| * LayoutLib: Change nullity annotations.Deepanshu Gupta2015-05-2236-53/+57
* | Merge "Revert "Fix build."" into mnc-devDeepanshu Gupta2015-05-231-1/+1
|\ \ | |/ |/|
| * Revert "Fix build."Deepanshu Gupta2015-05-231-1/+1
* | Revert "resolved conflicts for merge of 47249f2a to mnc-dev"Dianne Hackborn2015-05-221-2/+2
|/
* Fix build.Filip Gruszczynski2015-05-221-1/+1
* Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-devFilip Gruszczynski2015-05-221-2/+2
|\
| * resolved conflicts for merge of 47249f2a to mnc-devFilip Gruszczynski2015-05-201-2/+2
| |\
| | * am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-devFilip Gruszczynski2015-05-201-2/+2
| | |\
| | | * Support for devices with a chin.Filip Gruszczynski2015-05-201-2/+2
* | | | Add LayoutLibDelegate for new Bitmap method.Deepanshu Gupta2015-05-211-0/+7
* | | | Add documentation about hack in commit: f8ea750455Deepanshu Gupta2015-05-211-0/+14
|/ / /
* | | Fix overrides for BridgeResources.Deepanshu Gupta2015-05-201-8/+7
* | | Make DatePicker rendering not fail.Deepanshu Gupta2015-05-203-26/+104
* | | Use non deprecated method for creating ColorStateListDeepanshu Gupta2015-05-201-1/+2
* | | Fix line breaking.Deepanshu Gupta2015-05-201-47/+36
* | | Merge "Inject anonymous inner classes of injected classes" into mnc-devDeepanshu Gupta2015-05-204-11/+32
|\ \ \
| * | | Inject anonymous inner classes of injected classesDeepanshu Gupta2015-05-204-11/+32
* | | | Merge "Update platformDir search in tests." into mnc-devDeepanshu Gupta2015-05-201-2/+7
|\ \ \ \ | |/ / /
| * | | Update platformDir search in tests.Deepanshu Gupta2015-05-201-2/+7
* | | | Merge "Make Context.getClassLoader() work." into mnc-devDeepanshu Gupta2015-05-2011-31/+347
|\ \ \ \ | |/ / /
| * | | Make Context.getClassLoader() work.Deepanshu Gupta2015-05-1911-31/+347
* | | | Merge "Fix include tag rendering." into mnc-devDeepanshu Gupta2015-05-192-6/+11
|\ \ \ \ | |/ / /
| * | | Fix include tag rendering.Deepanshu Gupta2015-05-192-6/+11
* | | | Merge "Show better error message for color attr not found." into mnc-devDeepanshu Gupta2015-05-181-0/+5
|\ \ \ \ | |/ / /
| * | | Show better error message for color attr not found.Deepanshu Gupta2015-05-181-0/+5
* | | | Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-devAdam Powell2015-05-184-1/+48
|\ \ \ \
| * | | | Add -round and -notround qualifier to android runtime/aaptAdam Lesinski2015-05-154-1/+48
* | | | | Merge "Fix nav bar spacing for tablets." into mnc-devDeepanshu Gupta2015-05-183-21/+99
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix nav bar spacing for tablets.Deepanshu Gupta2015-05-183-21/+99
| |/ / /
* | | | Merge "AAPT2: Fix layout versioning" into mnc-devAdam Lesinski2015-05-162-14/+58
|\ \ \ \ | |/ / / |/| | |
| * | | AAPT2: Fix layout versioningAdam Lesinski2015-05-142-14/+58
* | | | Fix build: udpate parser factory methodDeepanshu Gupta2015-05-141-2/+11
* | | | Don't keep LayoutlibCallback reference.Deepanshu Gupta2015-05-143-84/+12
* | | | Move couple of intellij libraries to project level.Deepanshu Gupta2015-05-143-24/+26
* | | | Fix build.Deepanshu Gupta2015-05-132-5/+3
* | | | Update rendering fidelity tag to use constant.Deepanshu Gupta2015-05-131-4/+4
* | | | Use Balanced line breaker instead of HighQuality.Deepanshu Gupta2015-05-131-1/+1
* | | | Update nav bar icons.Deepanshu Gupta2015-05-1324-14/+149
* | | | Load ICU data in LayoutLibDeepanshu Gupta2015-05-134-6/+19
* | | | Add missing delegates for M preview.Deepanshu Gupta2015-05-1336-376/+491
* | | | Run setup for full tests only once.Deepanshu Gupta2015-05-131-26/+36
* | | | Remove kxml dependency.Deepanshu Gupta2015-05-137-43/+151
* | | | Merge "Fix build" into mnc-devJorim Jaggi2015-05-131-2/+2
|\ \ \ \
| * | | | Fix buildJorim Jaggi2015-05-131-2/+2
* | | | | Merge "Make sure the app can draw a frame before unlocking" into mnc-devJorim Jaggi2015-05-131-1/+5
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |