Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "AAPT2: Remove the need for specifying package name in compile phase" i... | Adam Lesinski | 2015-06-18 | 7 | -62/+74 |
|\ | |||||
| * | AAPT2: Remove the need for specifying package name in compile phase | Adam Lesinski | 2015-06-12 | 7 | -62/+74 |
* | | Fix issue #21814207 and issue #21814212 (alarm manager) | Dianne Hackborn | 2015-06-17 | 1 | -0/+14 |
* | | am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix f... | Diego Perez | 2015-06-15 | 2 | -2/+6 |
|\ \ | |||||
| * \ | am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on... | Diego Perez | 2015-06-15 | 2 | -2/+6 |
| |\ \ | |||||
| | * \ | am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor... | Diego Perez | 2015-06-15 | 2 | -2/+6 |
| | |\ \ | |||||
| | | * \ | am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr... | Diego Perez | 2015-06-15 | 2 | -2/+6 |
| | | |\ \ | |||||
| | | | * \ | Merge "Fix for shadows on theme editor" into lmp-mr1-dev | Diego Perez | 2015-06-15 | 2 | -2/+6 |
| | | | |\ \ | |||||
| | | | | * | | Fix for shadows on theme editor | Diego Perez | 2015-06-02 | 2 | -2/+6 |
* | | | | | | | am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix G... | Diego Perez | 2015-06-15 | 1 | -2/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot dra... | Diego Perez | 2015-06-15 | 1 | -2/+13 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when... | Diego Perez | 2015-06-15 | 1 | -2/+13 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is ... | Diego Perez | 2015-06-15 | 1 | -2/+13 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev | Diego Perez | 2015-06-15 | 1 | -2/+13 |
| | | | |\ \ \ | |||||
| | | | | * | | | Fix GcSnapshot drawInLayer when clipping is used. | Diego Perez | 2015-05-07 | 1 | -2/+13 |
* | | | | | | | | am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New c... | Diego Perez | 2015-06-15 | 7 | -2/+357 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets... | Diego Perez | 2015-06-12 | 7 | -2/+357 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" int... | Diego Perez | 2015-06-12 | 7 | -2/+357 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev | Diego Perez | 2015-06-12 | 7 | -2/+357 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge "New custom widgets library" into lmp-mr1-dev | Diego Perez | 2015-06-12 | 7 | -2/+357 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | New custom widgets library | Diego Perez | 2015-05-14 | 7 | -2/+357 |
| | | | | | |/ / | | | | | |/| | | |||||
* | | | | | | | | resolved conflicts for merge of 5a53816b to mnc-dev | Diego Perez | 2015-06-15 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | am c051c556: am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when sha... | Diego Perez | 2015-06-12 | 1 | -2/+9 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0"... | Diego Perez | 2015-06-12 | 1 | -2/+9 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1... | Diego Perez | 2015-06-12 | 1 | -2/+9 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Fix crash when shadowSize is 0 | Diego Perez | 2015-05-08 | 1 | -2/+9 |
| | | | |/ / | |||||
| * | | | | | am 037c9cac: Merge "Fix build." into cw-d-mr1-dev | Filip Gruszczynski | 2015-05-21 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Fix build." into cw-d-mr1-dev | Filip Gruszczynski | 2015-05-21 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix build. | Filip Gruszczynski | 2015-05-20 | 1 | -1/+1 |
| | | |/ / / | |||||
* | | | | | | Merge "Support AppBar from Material Design." into mnc-dev | Jens Ole Lauridsen | 2015-06-12 | 4 | -1/+182 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Support AppBar from Material Design. | Jens Ole Lauridsen | 2015-06-11 | 4 | -1/+182 |
* | | | | | | | Configure auto-rotation tilt tolerance in config.xml. | Jeff Brown | 2015-06-11 | 2 | -1/+3 |
|/ / / / / / | |||||
* | | | | | | AAPT2: Proguard rules generation added. | Adam Lesinski | 2015-06-09 | 11 | -6/+458 |
* | | | | | | AAPT2: Add manifest merging | Adam Lesinski | 2015-06-04 | 6 | -16/+599 |
* | | | | | | Merge "AAPT2: Change xml file parsing to DOM based" into mnc-dev | Adam Lesinski | 2015-06-04 | 12 | -830/+1272 |
|\ \ \ \ \ \ | |||||
| * | | | | | | AAPT2: Change xml file parsing to DOM based | Adam Lesinski | 2015-06-04 | 12 | -830/+1272 |
* | | | | | | | Merge "aapt: add option for stricter symbol generation" into mnc-dev | Adrian Roos | 2015-06-02 | 5 | -3/+49 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | aapt: add option for stricter symbol generation | Adrian Roos | 2015-06-02 | 5 | -3/+49 |
* | | | | | | | | LayoutLib: Skip classes from java package. | Deepanshu Gupta | 2015-06-01 | 1 | -1/+3 |
* | | | | | | | | Skip warnings for some unresolved references. | Deepanshu Gupta | 2015-06-01 | 1 | -0/+41 |
|/ / / / / / / | |||||
* | | | | | | | Merge "Revert "Revert "Fix build.""" into mnc-dev | Filip Gruszczynski | 2015-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Revert "Fix build."" | Filip Gruszczynski | 2015-06-01 | 1 | -1/+1 |
* | | | | | | | | Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"""... | Filip Gruszczynski | 2015-06-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" | Filip Gruszczynski | 2015-05-27 | 1 | -2/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Fix ParserFactory not initialized error. | Deepanshu Gupta | 2015-05-30 | 1 | -3/+3 |
* | | | | | | | | Fix NPE in BridgeContext.obtainStyledAttributes() | Deepanshu Gupta | 2015-05-28 | 1 | -1/+2 |
* | | | | | | | | Fix BridgeTypedArray.getType() | Deepanshu Gupta | 2015-05-28 | 1 | -8/+114 |
|/ / / / / / / | |||||
* | | | | | | | Merge "Include Shapes in LayoutLib." into mnc-dev | Deepanshu Gupta | 2015-05-26 | 1 | -3/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Include Shapes in LayoutLib. | Deepanshu Gupta | 2015-05-26 | 1 | -3/+1 |
* | | | | | | | | Merge "LayoutLib: Support getting resource arrays." into mnc-dev | Deepanshu Gupta | 2015-05-26 | 22 | -14/+245 |
|\ \ \ \ \ \ \ \ |