Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Revert "Fix build."" into mnc-dev | Deepanshu Gupta | 2015-05-23 | 1 | -1/+1 |
|\ | |||||
| * | Revert "Fix build." | Deepanshu Gupta | 2015-05-23 | 1 | -1/+1 |
* | | Revert "resolved conflicts for merge of 47249f2a to mnc-dev" | Dianne Hackborn | 2015-05-22 | 1 | -2/+2 |
|/ | |||||
* | Fix build. | Filip Gruszczynski | 2015-05-22 | 1 | -1/+1 |
* | Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev | Filip Gruszczynski | 2015-05-22 | 1 | -2/+2 |
|\ | |||||
| * | resolved conflicts for merge of 47249f2a to mnc-dev | Filip Gruszczynski | 2015-05-20 | 1 | -2/+2 |
| |\ | |||||
| | * | am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev | Filip Gruszczynski | 2015-05-20 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Support for devices with a chin. | Filip Gruszczynski | 2015-05-20 | 1 | -2/+2 |
* | | | | Add LayoutLibDelegate for new Bitmap method. | Deepanshu Gupta | 2015-05-21 | 1 | -0/+7 |
* | | | | Add documentation about hack in commit: f8ea750455 | Deepanshu Gupta | 2015-05-21 | 1 | -0/+14 |
|/ / / | |||||
* | | | Fix overrides for BridgeResources. | Deepanshu Gupta | 2015-05-20 | 1 | -8/+7 |
* | | | Make DatePicker rendering not fail. | Deepanshu Gupta | 2015-05-20 | 3 | -26/+104 |
* | | | Use non deprecated method for creating ColorStateList | Deepanshu Gupta | 2015-05-20 | 1 | -1/+2 |
* | | | Fix line breaking. | Deepanshu Gupta | 2015-05-20 | 1 | -47/+36 |
* | | | Merge "Inject anonymous inner classes of injected classes" into mnc-dev | Deepanshu Gupta | 2015-05-20 | 4 | -11/+32 |
|\ \ \ | |||||
| * | | | Inject anonymous inner classes of injected classes | Deepanshu Gupta | 2015-05-20 | 4 | -11/+32 |
* | | | | Merge "Update platformDir search in tests." into mnc-dev | Deepanshu Gupta | 2015-05-20 | 1 | -2/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Update platformDir search in tests. | Deepanshu Gupta | 2015-05-20 | 1 | -2/+7 |
* | | | | Merge "Make Context.getClassLoader() work." into mnc-dev | Deepanshu Gupta | 2015-05-20 | 11 | -31/+347 |
|\ \ \ \ | |/ / / | |||||
| * | | | Make Context.getClassLoader() work. | Deepanshu Gupta | 2015-05-19 | 11 | -31/+347 |
* | | | | Merge "Fix include tag rendering." into mnc-dev | Deepanshu Gupta | 2015-05-19 | 2 | -6/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix include tag rendering. | Deepanshu Gupta | 2015-05-19 | 2 | -6/+11 |
* | | | | Merge "Show better error message for color attr not found." into mnc-dev | Deepanshu Gupta | 2015-05-18 | 1 | -0/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Show better error message for color attr not found. | Deepanshu Gupta | 2015-05-18 | 1 | -0/+5 |
* | | | | Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-dev | Adam Powell | 2015-05-18 | 4 | -1/+48 |
|\ \ \ \ | |||||
| * | | | | Add -round and -notround qualifier to android runtime/aapt | Adam Lesinski | 2015-05-15 | 4 | -1/+48 |
* | | | | | Merge "Fix nav bar spacing for tablets." into mnc-dev | Deepanshu Gupta | 2015-05-18 | 3 | -21/+99 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix nav bar spacing for tablets. | Deepanshu Gupta | 2015-05-18 | 3 | -21/+99 |
| |/ / / | |||||
* | | | | Merge "AAPT2: Fix layout versioning" into mnc-dev | Adam Lesinski | 2015-05-16 | 2 | -14/+58 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | AAPT2: Fix layout versioning | Adam Lesinski | 2015-05-14 | 2 | -14/+58 |
* | | | | Fix build: udpate parser factory method | Deepanshu Gupta | 2015-05-14 | 1 | -2/+11 |
* | | | | Don't keep LayoutlibCallback reference. | Deepanshu Gupta | 2015-05-14 | 3 | -84/+12 |
* | | | | Move couple of intellij libraries to project level. | Deepanshu Gupta | 2015-05-14 | 3 | -24/+26 |
* | | | | Fix build. | Deepanshu Gupta | 2015-05-13 | 2 | -5/+3 |
* | | | | Update rendering fidelity tag to use constant. | Deepanshu Gupta | 2015-05-13 | 1 | -4/+4 |
* | | | | Use Balanced line breaker instead of HighQuality. | Deepanshu Gupta | 2015-05-13 | 1 | -1/+1 |
* | | | | Update nav bar icons. | Deepanshu Gupta | 2015-05-13 | 24 | -14/+149 |
* | | | | Load ICU data in LayoutLib | Deepanshu Gupta | 2015-05-13 | 4 | -6/+19 |
* | | | | Add missing delegates for M preview. | Deepanshu Gupta | 2015-05-13 | 36 | -376/+491 |
* | | | | Run setup for full tests only once. | Deepanshu Gupta | 2015-05-13 | 1 | -26/+36 |
* | | | | Remove kxml dependency. | Deepanshu Gupta | 2015-05-13 | 7 | -43/+151 |
* | | | | Merge "Fix build" into mnc-dev | Jorim Jaggi | 2015-05-13 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix build | Jorim Jaggi | 2015-05-13 | 1 | -2/+2 |
* | | | | | Merge "Make sure the app can draw a frame before unlocking" into mnc-dev | Jorim Jaggi | 2015-05-13 | 1 | -1/+5 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | Make sure the app can draw a frame before unlocking | Jorim Jaggi | 2015-05-13 | 1 | -1/+5 |
* | | | | Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev | Adam Lesinski | 2015-05-13 | 3 | -9/+34 |
|\ \ \ \ | |||||
| * | | | | AAPT2: Fix issue where @null was wrongly encoded | Adam Lesinski | 2015-05-12 | 3 | -9/+34 |
* | | | | | Merge "AAPT2: Debug: Dump only targetted style" into mnc-dev | Adam Lesinski | 2015-05-13 | 5 | -27/+79 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | AAPT2: Debug: Dump only targetted style | Adam Lesinski | 2015-05-12 | 5 | -27/+79 |
* | | | | | Merge "AAPT2: inferred style parent processing" into mnc-dev | Adam Lesinski | 2015-05-13 | 8 | -19/+48 |
|\ \ \ \ \ | |/ / / / |