summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support AppBar from Material Design." into mnc-devJens Ole Lauridsen2015-06-124-1/+182
|\
| * Support AppBar from Material Design.Jens Ole Lauridsen2015-06-114-1/+182
* | Configure auto-rotation tilt tolerance in config.xml.Jeff Brown2015-06-112-1/+3
|/
* AAPT2: Proguard rules generation added.Adam Lesinski2015-06-0911-6/+458
* AAPT2: Add manifest mergingAdam Lesinski2015-06-046-16/+599
* Merge "AAPT2: Change xml file parsing to DOM based" into mnc-devAdam Lesinski2015-06-0412-830/+1272
|\
| * AAPT2: Change xml file parsing to DOM basedAdam Lesinski2015-06-0412-830/+1272
* | Merge "aapt: add option for stricter symbol generation" into mnc-devAdrian Roos2015-06-025-3/+49
|\ \
| * | aapt: add option for stricter symbol generationAdrian Roos2015-06-025-3/+49
* | | LayoutLib: Skip classes from java package.Deepanshu Gupta2015-06-011-1/+3
* | | Skip warnings for some unresolved references.Deepanshu Gupta2015-06-011-0/+41
|/ /
* | Merge "Revert "Revert "Fix build.""" into mnc-devFilip Gruszczynski2015-06-011-1/+1
|\ \
| * | Revert "Revert "Fix build.""Filip Gruszczynski2015-06-011-1/+1
* | | Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"""...Filip Gruszczynski2015-06-011-2/+2
|\ \ \
| * | | Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""Filip Gruszczynski2015-05-271-2/+2
| | |/ | |/|
* | | Fix ParserFactory not initialized error.Deepanshu Gupta2015-05-301-3/+3
* | | Fix NPE in BridgeContext.obtainStyledAttributes()Deepanshu Gupta2015-05-281-1/+2
* | | Fix BridgeTypedArray.getType()Deepanshu Gupta2015-05-281-8/+114
|/ /
* | 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