summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only...Dianne Hackborn2011-06-161-8/+48
|\
| * am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ...Dianne Hackborn2011-06-161-8/+48
| |\
| | * Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into...Dianne Hackborn2011-06-161-8/+48
| | |\
| | | * New orientation handling. Only impacts SDK (aapt dump badging).Dianne Hackborn2011-06-161-8/+48
* | | | am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from ...Xavier Ducrohet2011-06-1614-196/+328
|\ \ \ \ | |/ / /
| * | | am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| |\ \ \ | | |/ /
| | * | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| | |/
* | | Fix changed native method delegates in layoutlib for ICS.Xavier Ducrohet2011-06-153-6/+66
* | | resolved conflicts for merge of 77fc8b80 to masterDianne Hackborn2011-06-141-22/+134
|\ \ \ | |/ /
| * | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f...Dianne Hackborn2011-06-141-22/+134
| |\ \ | | |/
| | * Add new landscape and portrait orientation features.Dianne Hackborn2011-06-141-22/+134
* | | am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on...Dianne Hackborn2011-06-101-2/+2
|\ \ \ | |/ /
| * | am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public s...Dianne Hackborn2011-06-101-2/+2
| |\ \ | | |/
| | * Okay *now* really enforce the limit on non-public styles.Dianne Hackborn2011-06-091-2/+2
* | | am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-101-2/+2
|\ \ \ | |/ /
| * | am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-091-2/+2
| |\ \ | | |/
| | * Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-091-2/+2
* | | resolved conflicts for merge of f51ded0f to masterDianne Hackborn2011-06-102-4/+5
|\ \ \ | |/ /
| * | am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag p...Dianne Hackborn2011-06-092-4/+5
| |\ \ | | |/
| | * Enforce public resource restriction on bag parents.Dianne Hackborn2011-06-092-4/+5
* | | am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into...Xavier Ducrohet2011-06-103-20/+58
|\ \ \ | |/ /
| * | am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2Xavier Ducrohet2011-06-093-20/+58
| |\ \ | | |/
| | * Merge 06942bc4 from hc-mr1.Xavier Ducrohet2011-06-082-4/+9
| | * Merge 988eeeb5 from hc-mr1.Xavier Ducrohet2011-06-083-16/+49
* | | am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr...Xavier Ducrohet2011-06-0713-103/+348
|\ \ \ | |/ /
| * | am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into hone...Xavier Ducrohet2011-06-0613-103/+348
| |\ \ | | |/
| | * Import the Layoutlib from hc-mr1.Xavier Ducrohet2011-06-0313-103/+348
* | | resolved conflicts for merge of 54cb63e2 to masterDianne Hackborn2011-06-021-0/+5
|\ \ \ | |/ /
| * | am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+5
| |\ \ | | |/
| | * Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+5
| * | am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability....Jeff Brown2011-05-251-0/+289
| |\ \ | | |/
| | * Improve VelocityTracker numerical stability. (DO NOT MERGE)Jeff Brown2011-05-231-0/+289
* | | resolved conflicts for merge of bbca8133 to masterDianne Hackborn2011-05-241-0/+5
|\ \ \ | |/ /
| * | am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2Dianne Hackborn2011-05-231-0/+5
| |\ \ | | |/
| | * Add "television" mode.Dianne Hackborn2011-05-231-0/+5
* | | resolved conflicts for merge of 06a8ceac to masterDianne Hackborn2011-05-193-45/+111
|\ \ \ | |/ /
| * | am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-193-45/+111
| |\ \ | | |/
| | * Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-193-45/+111
* | | am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support...Xavier Ducrohet2011-05-193-21/+33
|\ \ \ | |/ /
| * | am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new base...Xavier Ducrohet2011-05-183-21/+33
| |\ \ | | |/
| | * am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." in...Xavier Ducrohet2011-05-183-21/+33
| | |\
| | | * LayoutLib: support the new baseline/margin query API.Xavier Ducrohet2011-05-163-21/+33
* | | | am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data...Xavier Ducrohet2011-05-1311-52/+799
|\ \ \ \ | |/ / /
| * | | am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for ...Xavier Ducrohet2011-05-1311-52/+799
| |\ \ \ | | |/ /
| | * | am 2fae858d: LayoutLib: implement data binding for most AdapterViewXavier Ducrohet2011-05-1311-52/+799
| | |\ \ | | | |/
| | | * LayoutLib: implement data binding for most AdapterViewXavier Ducrohet2011-05-1311-52/+799
| * | | am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen widt...Dianne Hackborn2011-05-133-12/+137
| |\ \ \ | | |/ /
| | * | DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-123-12/+137
| | |/
* | | resolved conflicts for merge of 18490fb9 to masterKenny Root2011-04-123-1/+12
|\ \ \ | |/ /
| * | resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aospKenny Root2011-04-123-1/+12
| |\ \ | | |/ | |/|