summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit ↵Dianne Hackborn2011-06-101-2/+2
|\ | | | | | | | | | | | | on non-public styles. * commit 'f14dff1219d2a87340dccad657f666f5451d8c6e': Okay *now* really enforce the limit on non-public styles.
| * am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public ↵Dianne Hackborn2011-06-101-2/+2
| |\ | | | | | | | | | | | | | | | | | | styles. * commit 'c6adfed6dcea8482e482db58bd396ea8de08426a': Okay *now* really enforce the limit on non-public styles.
| | * Okay *now* really enforce the limit on non-public styles.Dianne Hackborn2011-06-091-2/+2
| | | | | | | | | | | | Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
* | | am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-101-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '9980043e930f877c4cd066de2b3d57dce4fc926e': Ummm... f*, stop breaking the build.
| * | am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-091-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '820caf7b04f1e5c83599437e9e783e91322eb4f9': Ummm... f*, stop breaking the build.
| | * Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-091-2/+2
| | | | | | | | | | | | Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
* | | resolved conflicts for merge of f51ded0f to masterDianne Hackborn2011-06-102-4/+5
|\ \ \ | |/ / | | | | | | Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
| * | am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag ↵Dianne Hackborn2011-06-092-4/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | parents." into honeycomb-mr2 * commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942': Enforce public resource restriction on bag parents.
| | * Enforce public resource restriction on bag parents.Dianne Hackborn2011-06-092-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Need to put some more styles in the SDK to avoid breaking apps. Also, welcome Android 3.2. Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
* | | am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f ↵Xavier Ducrohet2011-06-103-20/+58
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '48305f327ff3839ddbfa5a6fb42a57150a69480c': Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.
| * | am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2Xavier Ducrohet2011-06-093-20/+58
| |\ \ | | |/ | | | | | | | | | | | | * commit '2e0f71181792780b55826bcc562ae79951e76f1b': Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.
| | * Merge 06942bc4 from hc-mr1.Xavier Ducrohet2011-06-082-4/+9
| | | | | | | | | | | | | | | | | | Layoutlib - use the new getParser callback when possible. Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
| | * Merge 988eeeb5 from hc-mr1.Xavier Ducrohet2011-06-083-16/+49
| | | | | | | | | | | | | | | | | | Support for custom declare-styleable attr with enum/flag in layoutlib. Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
* | | am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from ↵Xavier Ducrohet2011-06-0713-103/+348
|\ \ \ | |/ / | | | | | | | | | | | | | | | hc-mr1." into honeycomb-mr2 * commit 'abc838716816107754ab0479242d03807ce79fc2': Import the Layoutlib from hc-mr1.
| * | am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into ↵Xavier Ducrohet2011-06-0613-103/+348
| |\ \ | | |/ | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'f6e479993e7c85265692829990ceb3879fbce424': Import the Layoutlib from hc-mr1.
| | * Import the Layoutlib from hc-mr1.Xavier Ducrohet2011-06-0313-103/+348
| | | | | | | | | | | | | | | | | | This is squash commit of all the missing patches. Change-Id: Ie081c46a173290646deddbde503a720d50c4400f
* | | resolved conflicts for merge of 54cb63e2 to masterDianne Hackborn2011-06-021-0/+5
|\ \ \ | |/ / | | | | | | Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
| * | am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+5
| |\ \ | | |/ | | | | | | | | | * commit '528c49f112dce5f9687f30a9751e783196eca0c6': Add "tv" density for 720p screens.
| | * Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+5
| | | | | | | | | | | | Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
| * | am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical ↵Jeff Brown2011-05-251-0/+289
| |\ \ | | |/ | | | | | | | | | | | | | | | stability. (DO NOT MERGE)" into honeycomb-mr2 * commit '16330e249663fed890df0e95fce4016c2971120a': Improve VelocityTracker numerical stability. (DO NOT MERGE)
| | * Improve VelocityTracker numerical stability. (DO NOT MERGE)Jeff Brown2011-05-231-0/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced VelocityTracker with a faster and more accurate native implementation. This avoids the duplicate maintenance overhead of having two implementations. The new algorithm requires that the sample duration be at least 10ms in order to contribute to the velocity calculation. This ensures that the velocity is not severely overestimated when samples arrive in bursts. The new algorithm computes the exponentially weighted moving average using weights based on the relative duration of successive sample periods. The new algorithm is also more careful about how it handles individual pointers going down or up and their effects on the collected movement traces. The intent is to preserve the last known velocity of pointers as they go up while also ensuring that other motion samples do not count twice in that case. Bug: 4086785 Change-Id: I95054102397c4b6a9076dc6a0fc841b4beec7920
* | | resolved conflicts for merge of bbca8133 to masterDianne Hackborn2011-05-241-0/+5
|\ \ \ | |/ / | | | | | | Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
| * | am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2Dianne Hackborn2011-05-231-0/+5
| |\ \ | | |/ | | | | | | | | | * commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9': Add "television" mode.
| | * Add "television" mode.Dianne Hackborn2011-05-231-0/+5
| | | | | | | | | | | | Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
* | | resolved conflicts for merge of 06a8ceac to masterDianne Hackborn2011-05-193-45/+111
|\ \ \ | |/ / | | | | | | Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
| * | am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-193-45/+111
| |\ \ | | |/ | | | | | | | | | * commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a': Add new "-swNNNdp" resource qualifier.
| | * Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-193-45/+111
| | | | | | | | | | | | Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
* | | am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: ↵Xavier Ducrohet2011-05-193-21/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | support the new baseline/margin query API." into honeycomb-mr1 * commit 'a13462a947e634a6893119146a7271369e509586': LayoutLib: support the new baseline/margin query API.
| * | am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new ↵Xavier Ducrohet2011-05-183-21/+33
| |\ \ | | |/ | | | | | | | | | | | | | | | baseline/margin query API." into honeycomb-mr1 * commit '582841e734bc85b247df64ac85b6ee09f7375f44': LayoutLib: support the new baseline/margin query API.
| | * am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." ↵Xavier Ducrohet2011-05-183-21/+33
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1 * commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0': LayoutLib: support the new baseline/margin query API.
| | | * LayoutLib: support the new baseline/margin query API.Xavier Ducrohet2011-05-163-21/+33
| | | | | | | | | | | | | | | | Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
* | | | am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement ↵Xavier Ducrohet2011-05-1311-52/+799
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | data binding for most AdapterView * commit 'd00541603fbbb4e38264e75a2b6abf8705efeb49': LayoutLib: implement data binding for most AdapterView
| * | | am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for ↵Xavier Ducrohet2011-05-1311-52/+799
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | most AdapterView * commit '6d040a7f20de29a9667dd81bd4de40a9e56fd341': LayoutLib: implement data binding for most AdapterView
| | * | am 2fae858d: LayoutLib: implement data binding for most AdapterViewXavier Ducrohet2011-05-1311-52/+799
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '2fae858db55fc6984ef923a6226b9408c37c72cb': LayoutLib: implement data binding for most AdapterView
| | | * LayoutLib: implement data binding for most AdapterViewXavier Ducrohet2011-05-1311-52/+799
| | | | | | | | | | | | | | | | Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
| * | | am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen ↵Dianne Hackborn2011-05-133-12/+137
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | width/height in "dp" configs." into honeycomb-mr2 * commit '46a282f323bc05606e4fe1eba795bd9ac7c99819': DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
| | * | DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-123-12/+137
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now specify resource configuration variants "wNNNdp" and "hNNNdp". These are the minimum screen width/height in "dp" units. This allows you to do things like have your app adjust its layout based only on the about of horizontal space available. This introduces a new configuration change flag for screen size. Note that this configuration change happens each time the orientation changes. Applications often say they handle the orientation change to avoid being restarted at a screen rotation, and this will now cause them to be restarted. To address this, we assume the app can handle this new config change if its target SDK version is < ICS. Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
* | | resolved conflicts for merge of 18490fb9 to masterKenny Root2011-04-123-1/+12
|\ \ \ | |/ / | | | | | | Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
| * | resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aospKenny Root2011-04-123-1/+12
| |\ \ | | |/ | |/| | | | Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
| | * am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-113-1/+12
| | |\ | | | | | | | | | | | | | | | | * commit '08d9d9a46250c4fad66e9b637e8898a3524c4286': Runtime resource overlay, iteration 1.
| | | * Runtime resource overlay, iteration 1.Mårten Kongstad2011-04-013-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runtime resource overlay allows unmodified applications to appear as if they had been compiled with additional resources defined. See libs/utils/README for more information. This commit is the first iteration of runtime resource overlay. It provides the actual overlay modifications and loading of trusted overlay packages (ie residing in /vendor) targeting framework-res.apk. This commit loads exactly one overlay package. The overlay, if present, must target framework-res.apk and be located at /vendor/overlay/framework/framework-res.apk. Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
| | * | am 59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to ↵Xavier Ducrohet2011-04-062-18/+35
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0 scale. * commit '59aad78eae14939c169876b2f632d005f382cf7d': LayoutLib: don't render when shader's local matrix is set to 0 scale.
| | | * | LayoutLib: don't render when shader's local matrix is set to 0 scale.Xavier Ducrohet2011-04-062-18/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: I7726d87f3dd0475ac662f535a08c6435b8b9ed1f
| | * | | am 8a18dba4: Merge c5aeac7f from honeycomb.Xavier Ducrohet2011-04-061-23/+75
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '8a18dba48c354fc47056b07ddec8a32fda266b6a': Merge c5aeac7f from honeycomb.
| | | * | Merge c5aeac7f from honeycomb.Xavier Ducrohet2011-04-061-23/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: Fix issue with rendering mode. When the layout content is embedded inside a decor layout to emulate system bar (top or bottom) and title bar (or action bar) then the code computing the full required size based on the RenderingMode would fail because the decor layout would prevents the content layout to take as much room as possible. There is also an issue with the way we know render dialogs as the dialogs usually as a frame with some padding and the previous measurements would not take into account the dialog padding when increasing the screen size. This fix makes the code measure the size of the content layout in the normal rendering, and then separately from the root layout with the proper MeasureSpec to let the content grown. The difference in size is then added to the screen size. Bug: http://code.google.com/p/android/issues/detail?id=15892 Change-Id: Ie9a6c5e254b16785f817dcb9fae755d4936880aa
| | * | | am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.Xavier Ducrohet2011-03-171-11/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f': Merge 67450db0 from honeycomb. Do not merge.
| | | * | Merge 67450db0 from honeycomb. Do not merge.Xavier Ducrohet2011-03-171-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335 LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
| | * | | am 0a98226e: Merge 9d76581f from honeycomb. do not merge.Xavier Ducrohet2011-03-152-30/+52
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '0a98226e3c8cda46786558147a0eb6a56c3370c0': Merge 9d76581f from honeycomb. do not merge.
| | | * | Merge 9d76581f from honeycomb. do not merge.Xavier Ducrohet2011-03-152-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: Fix Arc rendering. Looks like Java2D and Skia go in different directions for angles. Change-Id: I4d72db56455afe25b4f51f23a9b29d6c438119ba
| | * | | am b243aabd: Merge adaa12cd from honeycomb. do not merge.Xavier Ducrohet2011-03-153-12/+23
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'b243aabdaf1ba6fdfc0579c9f949e00d562456ed': Merge adaa12cd from honeycomb. do not merge.