| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into l... | Deepanshu Gupta | 2014-11-11 | 2 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | | * | | | | | | | am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev | Deepanshu Gupta | 2014-11-11 | 2 | -1/+2 | |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||||
| | | | * | | | | | | Don't skip loading object animator. | Deepanshu Gupta | 2014-11-11 | 2 | -1/+2 | |
| | | | | |_|_|_|/ | | | |/| | | | | ||||||
| * | | | | | | | | am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: ... | Adam Lesinski | 2014-11-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | split-select: fix OSX build | Adam Lesinski | 2014-11-10 | 3 | -6/+6 | |
| | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | | am 1521303f: Merge "kill OS_CASE_SENSITIVE" | Yabin Cui | 2014-11-11 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | | kill OS_CASE_SENSITIVE | Yabin Cui | 2014-11-10 | 1 | -1/+2 | |
| | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." | Dan Albert | 2014-10-20 | 1 | -1/+1 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ... | Adam Lesinski | 2014-10-20 | 1 | -1/+4 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly ... | Adam Lesinski | 2014-10-17 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | am f47f8855: Merge "Added a daemon mode to aapt to receive streams of command... | Jerome Dochez | 2014-10-10 | 4 | -0/+40 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structu... | Elliott Hughes | 2014-10-09 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. | Deepanshu Gupta | 2014-10-08 | 5 | -22/+125 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v fl... | Adam Lesinski | 2014-10-03 | 1 | -20/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am c74a2b34: Merge "Minor style changes." into lmp-dev | Deepanshu Gupta | 2014-10-03 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp | Neil Fuller | 2014-10-02 | 4 | -141/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" | Andreas Gampe | 2014-10-02 | 4 | -30/+51 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp | Andreas Gampe | 2014-10-01 | 13 | -387/+540 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev | Deepanshu Gupta | 2014-10-02 | 2 | -202/+110 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev | Stephen Hines | 2014-10-01 | 2 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aosp | Dan Albert | 2014-10-01 | 5 | -142/+22 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 052c4c4b: Merge "Update time in layout preview" into lmp-dev | Deepanshu Gupta | 2014-09-30 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh... | Adam Lesinski | 2014-09-26 | 2 | -1/+19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu... | Adam Lesinski | 2014-09-22 | 9 | -36/+316 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp | Dan Albert | 2014-09-19 | 1 | -3/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi... | Adam Lesinski | 2014-09-19 | 3 | -3/+225 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8bdd408b: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev | Deepanshu Gupta | 2014-09-16 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automer... | Deepanshu Gupta | 2014-11-10 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automer... | Deepanshu Gupta | 2014-11-10 | 1 | -0/+17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix setting styles in custom views." into lmp-dev | Deepanshu Gupta | 2014-11-10 | 1 | -0/+17 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Fix setting styles in custom views. | Deepanshu Gupta | 2014-11-10 | 1 | -0/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev ... | Deepanshu Gupta | 2014-11-10 | 20 | -59/+798 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev ... | Deepanshu Gupta | 2014-11-10 | 20 | -59/+798 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add primitive shadows support to LayoutLib" into lmp-dev | Deepanshu Gupta | 2014-11-10 | 20 | -59/+798 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Add primitive shadows support to LayoutLib | Deepanshu Gupta | 2014-11-07 | 20 | -59/+798 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev autom... | Deepanshu Gupta | 2014-11-10 | 2 | -50/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev autom... | Deepanshu Gupta | 2014-11-10 | 2 | -50/+43 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove needlessly thrown IOException." into lmp-dev | Deepanshu Gupta | 2014-11-10 | 2 | -50/+43 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Remove needlessly thrown IOException. | Deepanshu Gupta | 2014-11-06 | 2 | -50/+43 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa31eb2c' into manualmerge | Adam Lesinski | 2014-11-10 | 12 | -245/+350 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev | Adam Lesinski | 2014-11-10 | 12 | -245/+350 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | split-select: Fix rules generated for anydpi density | Adam Lesinski | 2014-11-06 | 12 | -245/+350 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into l... | Dan Sandler | 2014-11-10 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix inset hinting when adding window | Adrian Roos | 2014-11-10 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks... | Winson Chung | 2014-11-07 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Adding bounce animation for affiliated tasks. (Bug 16656169) | Winson Chung | 2014-11-06 | 1 | -0/+5 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fb96e54' into manualmerge | Adam Lesinski | 2014-11-05 | 8 | -5/+238 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add error checking to aapt for split generation" into lmp-mr1-dev | Adam Lesinski | 2014-11-05 | 8 | -5/+237 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Add error checking to aapt for split generation | Adam Lesinski | 2014-11-03 | 8 | -5/+237 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues that occurred due to building with clang | Adam Lesinski | 2014-11-03 | 1 | -5/+5 | |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |