Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split up android.policy into framework.jar and services.jar 1/3 | Jorim Jaggi | 2015-02-10 | 1 | -1/+0 |
* | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 3 | -2/+68 |
|\ | |||||
| * | Replace java.util.LinkedHashMap.eldest() | Deepanshu Gupta | 2015-01-07 | 3 | -2/+68 |
* | | resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again | Deepanshu Gupta | 2015-01-06 | 1 | -1/+0 |
|/ | |||||
* | am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev | Deepanshu Gupta | 2015-01-06 | 1 | -1/+0 |
|\ | |||||
| * | Remove Time from CreateInfo | Deepanshu Gupta | 2015-01-02 | 1 | -1/+0 |
* | | am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" i... | Deepanshu Gupta | 2015-01-06 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Fix default initial value for preferences | Deepanshu Gupta | 2014-12-23 | 1 | -1/+0 |
* | | am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev | Deepanshu Gupta | 2015-01-06 | 2 | -0/+4 |
|\ \ | |/ | |||||
| * | Add preferences rendering. | Deepanshu Gupta | 2014-12-23 | 2 | -0/+4 |
* | | resolved conflicts for a0bc2e7e to lmp-mr1-dev | Deepanshu Gupta | 2014-12-30 | 1 | -0/+1 |
* | | am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev | Deepanshu Gupta | 2014-12-04 | 3 | -31/+99 |
|\ \ | |/ | |||||
| * | Fix AnalogClock rendering | Deepanshu Gupta | 2014-11-26 | 3 | -31/+99 |
| * | LayoutLib: Stub AM/PM keycodes in Time Picker. | Deepanshu Gupta | 2014-11-18 | 1 | -0/+1 |
|/ | |||||
* | Don't skip loading object animator. | Deepanshu Gupta | 2014-11-11 | 1 | -0/+1 |
* | Add primitive shadows support to LayoutLib | Deepanshu Gupta | 2014-11-07 | 1 | -0/+5 |
* | Merge "Skip loading animations." into lmp-dev | Deepanshu Gupta | 2014-10-29 | 1 | -0/+1 |
|\ | |||||
| * | Skip loading animations. | Deepanshu Gupta | 2014-10-28 | 1 | -0/+1 |
* | | Fix multiple styles case in resource resolution. | Deepanshu Gupta | 2014-10-28 | 1 | -1/+0 |
|/ | |||||
* | am 4f133894: Exclude KXmlParser from LayoutLib. | Deepanshu Gupta | 2014-10-08 | 4 | -22/+39 |
|\ | |||||
| * | Exclude KXmlParser from LayoutLib. | Deepanshu Gupta | 2014-10-08 | 4 | -22/+39 |
| * | LayoutLib: Use ICU's line break algo. [DO NOT MERGE] | Deepanshu Gupta | 2014-10-08 | 1 | -0/+1 |
| * | am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2:... | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| |\ | |||||
| | * | am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b:... | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| | |\ | |||||
| | | * | am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved con... | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for me... | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| | | | |\ | |||||
| | | | | * | am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| | | | | |\ | |||||
| | | | | | * | resolved conflicts for merge of a232a68d to jb-mr1.1-docs | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| | | | | | |\ | |||||
| | | | | | | * | resolved conflicts for merge of 5476cfee to jb-mr1-dev | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| | | | | | | |\ | |||||
| | | | | | | | * | am 505c675c: Fix SystemProperties in LayoutLib. | Deepanshu Gupta | 2014-08-06 | 1 | -1/+1 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | Fix SystemProperties in LayoutLib. | Deepanshu Gupta | 2014-08-05 | 1 | -1/+1 |
| | | | | | * | | | | am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correct... | Deepanshu Gupta | 2014-05-13 | 1 | -1/+1 |
| | | | | | |\ \ \ \ | | | | | | | |/ / / | |||||
| | | | | | | * | | | am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-d... | Deepanshu Gupta | 2014-05-13 | 1 | -1/+1 |
| | | | | | | |\ \ \ | | | | | | | | |/ / | |||||
| | | | | | | | * | | Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp | Deepanshu Gupta | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | |\ \ | |||||
| | | | | | | | | * | | resolve conflicts for merge 5a7b3b65 correctly | Deepanshu Gupta | 2014-05-12 | 1 | -1/+1 |
| | | | | | * | | | | | am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus.... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -0/+2 |
| | | | | | | | |\ \ \ | | | | | | | | | | |/ | | | | | | | | | |/| | |||||
| | | | | | | | | * | | Add view cookies for action bar menus. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-07 | 1 | -0/+2 |
| | | | | | * | | | | | am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev | Deepanshu Gupta | 2014-05-13 | 1 | -0/+1 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev | Deepanshu Gupta | 2014-05-13 | 1 | -0/+1 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -0/+1 |
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | |||||
| | | | | | | | | * | | Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-05-06 | 1 | -0/+1 |
| | | | | | * | | | | | am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutli... | Deepanshu Gupta | 2014-05-13 | 1 | -0/+3 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -0/+3 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -0/+3 |
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | |||||
| | | | | | | | | * | | Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-05-06 | 1 | -0/+3 |
| | | | | | * | | | | | am 5594616c: am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create... | Deepanshu Gupta | 2014-05-13 | 1 | -2/+2 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -2/+2 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] | Deepanshu Gupta | 2014-05-13 | 1 | -2/+2 |
| | | | | | | | |\ \ \ | | | | | | | | | |/ / |