Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" | Xavier Ducrohet | 2011-07-20 | 2 | -4/+27 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" | Xavier Ducrohet | 2011-07-20 | 2 | -4/+27 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | am 9bac0a9f: Merge "Fix to compile for windows" | Xavier Ducrohet | 2011-07-20 | 2 | -4/+27 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Fix to compile for windows | Josiah Gaskin | 2011-07-20 | 2 | -4/+27 | |
* | | | | | | am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 20 | -13/+1206 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 20 | -13/+1206 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" | Xavier Ducrohet | 2011-07-20 | 20 | -13/+1206 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" | Xavier Ducrohet | 2011-07-20 | 20 | -13/+1206 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Added Caching for PreProcessed PNGs | Josiah Gaskin | 2011-07-20 | 20 | -13/+1206 | |
* | | | | | | am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 8 | -26/+62 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 8 | -26/+62 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ p... | Xavier Ducrohet | 2011-07-20 | 8 | -27/+63 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" | Xavier Ducrohet | 2011-07-20 | 8 | -27/+63 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Add generation of dependency file for .ap_ package | Josiah Gaskin | 2011-07-18 | 8 | -27/+63 | |
| | | | |/ | ||||||
* | | | | | Layoutlib: misc fix + start of AndroidBidi support. | Xavier Ducrohet | 2011-07-19 | 5 | -27/+57 | |
* | | | | | am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency gen... | Xavier Ducrohet | 2011-07-19 | 7 | -18/+110 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aa... | Xavier Ducrohet | 2011-07-19 | 7 | -18/+110 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" | Xavier Ducrohet | 2011-07-19 | 8 | -19/+111 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | am d40c93f6: Merge "Add dependency generation to Aapt for R.java" | Xavier Ducrohet | 2011-07-19 | 8 | -19/+111 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Add dependency generation to Aapt for R.java | Josiah Gaskin | 2011-06-27 | 8 | -19/+111 | |
* | | | | | am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created ... | Xavier Ducrohet | 2011-07-19 | 3 | -1/+26 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into l... | Xavier Ducrohet | 2011-07-19 | 3 | -1/+26 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" | Xavier Ducrohet | 2011-07-19 | 3 | -1/+26 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | am 42755155: Merge "Copy once-created R.java into library projects" | Xavier Ducrohet | 2011-07-19 | 3 | -1/+26 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Copy once-created R.java into library projects | Josiah Gaskin | 2011-06-27 | 3 | -1/+26 | |
| | * | | | am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into ginge... | Xavier Ducrohet | 2011-06-28 | 12 | -192/+322 | |
| | |\ \ \ | ||||||
| | | * | | | Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 12 | -192/+322 | |
| | * | | | | am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into ging... | Xavier Ducrohet | 2011-06-28 | 2 | -4/+9 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | CherryPick 06942bc4 from hc-mr1. do not merge. | Xavier Ducrohet | 2011-06-16 | 2 | -4/+9 | |
| | * | | | | am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into ging... | Xavier Ducrohet | 2011-06-28 | 3 | -16/+49 | |
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | ||||||
| | | * | | CherryPick 988eeeb5 from hc-mr1. do not merge. | Xavier Ducrohet | 2011-06-16 | 3 | -16/+49 | |
* | | | | | Enable IMEs to set additional subtypes in background | satok | 2011-07-19 | 1 | -1/+1 | |
* | | | | | 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 |