Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Fix aidl to cope with multiple collection types per method." | Elliott Hughes | 2011-07-14 | 4 | -111/+110 |
|\ | |||||
| * | Fix aidl to cope with multiple collection types per method. | Elliott Hughes | 2011-07-13 | 4 | -111/+110 |
* | | am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1. | Xavier Ducrohet | 2011-07-13 | 1 | -0/+60 |
|\ \ | |||||
| * \ | am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1. | Xavier Ducrohet | 2011-07-11 | 1 | -0/+60 |
| |\ \ | |||||
| | * | | Merge 36a3a392 from mr1. | Xavier Ducrohet | 2011-07-11 | 1 | -0/+60 |
* | | | | LayoutLib: updated fake accessbility manager and ensure there's an InputMetho... | Xavier Ducrohet | 2011-07-12 | 5 | -0/+291 |
* | | | | LayoutLib: Delegate for Display and IWindowManager implementation. | Xavier Ducrohet | 2011-07-12 | 6 | -20/+639 |
* | | | | new button graphics for layoutlib. | Xavier Ducrohet | 2011-07-11 | 9 | -0/+0 |
| |_|/ |/| | | |||||
* | | | am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original... | Raphael Moll | 2011-06-23 | 8 | -117/+319 |
|\ \ \ | |/ / | |||||
| * | | am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate ... | Raphael Moll | 2011-06-22 | 8 | -117/+319 |
| |\ \ | |||||
| | * \ | am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." | Raphael Moll | 2011-06-22 | 8 | -117/+319 |
| | |\ \ | |||||
| | | * | | Laoutlib_creator: keep original of delegate methods. | Raphael Moll | 2011-06-17 | 8 | -117/+319 |
| | * | | | am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into ging... | Xavier Ducrohet | 2011-06-06 | 3 | -0/+86 |
| | |\ \ \ | |||||
| | | * | | | Cherrypick d1ed33c4 from hc-mr1. do not merge. | Xavier Ducrohet | 2011-06-03 | 3 | -0/+86 |
| | * | | | | am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread | Xavier Ducrohet | 2011-06-06 | 9 | -18/+15 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Cherrypick 5b61ea6b from hc-mr1 | Xavier Ducrohet | 2011-06-03 | 1 | -1/+1 |
| | | * | | | LayoutLib: enable the LAYOUT_ONLY capability. | Xavier Ducrohet | 2011-06-02 | 1 | -1/+1 |
| | | * | | | Merge dba35f1b from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-06-01 | 7 | -16/+13 |
| | * | | | | am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-24 | 1 | -53/+58 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 6103e22c from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-24 | 1 | -53/+58 |
| | * | | | | am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-24 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 2402ad60 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-23 | 1 | -1/+1 |
| | * | | | | am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-23 | 3 | -32/+72 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge e57aa434 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-20 | 3 | -32/+72 |
| | * | | | | am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gi... | Xavier Ducrohet | 2011-05-23 | 3 | -22/+33 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 05b7b69c from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-19 | 3 | -22/+33 |
| | * | | | | am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gi... | Xavier Ducrohet | 2011-05-23 | 11 | -51/+799 |
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | |||||
| | | * | | Merge 2fae858d from Honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-19 | 11 | -51/+799 |
| | * | | | am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 | Conley Owens | 2011-04-27 | 1 | -1/+2 |
| | |\ \ \ | |||||
| | | * \ \ | Merge changes I0ab47e2f,Ib8016996 | Conley Owens | 2011-04-27 | 1 | -1/+2 |
| | | |\ \ \ | |||||
| | | | * | | | Normalize output of XMLtree content | Shachar Shemesh | 2011-04-11 | 1 | -1/+2 |
* | | | | | | | Fix build. | Brian Carlstrom | 2011-06-22 | 1 | -1/+0 |
* | | | | | | | Merge "Add missing delegate to the layoutlib." | Xavier Ducrohet | 2011-06-21 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add missing delegate to the layoutlib. | Xavier Ducrohet | 2011-06-21 | 2 | -1/+5 |
* | | | | | | | | Merge "Include testdata in layoutlib-tests." | Brett Chabot | 2011-06-21 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Include testdata in layoutlib-tests. | Brett Chabot | 2011-06-17 | 2 | -0/+2 |
* | | | | | | | | Output Proguard options for also overlay layouts. | Ying Wang | 2011-06-20 | 1 | -0/+5 |
* | | | | | | | | am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | New orientation handling. Only impacts SDK (aapt dump badging). | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
* | | | | | | | | | am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from ... | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
| | |/ / / / / | |||||
* | | | | | | | Fix changed native method delegates in layoutlib for ICS. | Xavier Ducrohet | 2011-06-15 | 3 | -6/+66 |
* | | | | | | | resolved conflicts for merge of 77fc8b80 to master | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f... | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Add new landscape and portrait orientation features. | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
* | | | | | | | am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on... | Dianne Hackborn | 2011-06-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public s... | Dianne Hackborn | 2011-06-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / |