summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | Merge dba35f1b from honeycomb-mr1. do not merge.Xavier Ducrohet2011-06-017-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe LayoutLib: Properly configure KXmlParser to read UTF8
| | * | | | am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-53/+58
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '34f5991ebe8b203f1720caf95889c15dd131d86e': Merge 6103e22c from honeycomb-mr1. do not merge.
| | | * | | Merge 6103e22c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-53/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: custom styles override the default style instead of replacing it. Intead of reading either the custom or the default style for a widget, we read both and use the values from the custom style if it exists, or from the default style otherwise. Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4
| | * | | | am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'c7b87766b21fe5cf2f644efa8753b936d413dc9a': Merge 2402ad60 from honeycomb-mr1. do not merge.
| | | * | | Merge 2402ad60 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: Fix Canvas_Delegate.native_concat(). Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
| | * | | | am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-233-32/+72
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525': Merge e57aa434 from honeycomb-mr1. do not merge.
| | | * | | Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-203-32/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: Fix issue where <include> with no layout params wouldn't display. The issue is that the layout params from the root element of the included layout should be used but this failed because loading the layout params from the <include> tag didn't throw a RuntimeException in our modified code (BridgeTypedArray). Because we don't want to throw exception in general we only throw it when reading the layout params of an include node which is pretty crappy, but works for now. Change-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e
| | * | | | am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into ↵Xavier Ducrohet2011-05-233-22/+33
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72': Merge 05b7b69c from honeycomb-mr1. do not merge.
| | | * | | Merge 05b7b69c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-193-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c LayoutLib: support the new baseline/margin query API.
| | * | | | am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into ↵Xavier Ducrohet2011-05-2311-51/+799
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | | | | | | | | | | gingerbread * commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5': Merge 2fae858d from Honeycomb-mr1. do not merge.
| | | * | Merge 2fae858d from Honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-1911-51/+799
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909 LayoutLib: implement data binding for most AdapterView
| | * | | am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a4d96e7ee682167861434cba05531f04642bf97': Remove errant tag terminator Normalize output of XMLtree content
| | | * \ \ Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove errant tag terminator Normalize output of XMLtree content
| | | | * | | Normalize output of XMLtree contentShachar Shemesh2011-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the output from aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Previous patch left out handling of XML element content. Change-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a
* | | | | | | Fix build.Brian Carlstrom2011-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit 22a614142aacce13fc46a0e524dbfb6ca56bf237 Change-Id: I1409bc3dd1f1b3027c12355e8b6aeffa2d857c83
* | | | | | | Merge "Add missing delegate to the layoutlib."Xavier Ducrohet2011-06-212-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Add missing delegate to the layoutlib.Xavier Ducrohet2011-06-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8de5c1093052c40c0cd327a4d02b01651d3b76b5
* | | | | | | | Merge "Include testdata in layoutlib-tests."Brett Chabot2011-06-212-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Include testdata in layoutlib-tests.Brett Chabot2011-06-172-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79fff895a13d171079b59db54d4b9d2bec555b3c
* | | | | | | | Output Proguard options for also overlay layouts.Ying Wang2011-06-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b
* | | | | | | | am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. ↵Dianne Hackborn2011-06-161-8/+48
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only impacts SDK (aapt dump badging)." into honeycomb-mr2 * commit '810dc5980c504a89974c07fcbd28a2b5dffb47de': New orientation handling. Only impacts SDK (aapt dump badging).
| * | | | | | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ↵Dianne Hackborn2011-06-161-8/+48
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (aapt dump badging)." into honeycomb-mr2 * commit 'f1c5dbbd457bb14d3673508aaba497cdc328a1ef': New orientation handling. Only impacts SDK (aapt dump badging).
| | * | | | | | Merge "New orientation handling. Only impacts SDK (aapt dump badging)." ↵Dianne Hackborn2011-06-161-8/+48
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | * | | | | | New orientation handling. Only impacts SDK (aapt dump badging).Dianne Hackborn2011-06-161-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new way of determining whether an application requires specific orientations, done by looking at any requirements in its activity tags. Note that this won't catch all possible issues, because applications can still force an orientation through Java APIs, but the vast majority of applications that actually require a specific orientation should be doing it this way because it the easiest way and the only way to cleanly launch into the app from a different orientation without doing some serious activity tricks. Change-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588
* | | | | | | | | am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from ↵Xavier Ducrohet2011-06-1614-196/+328
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | hc-mr1. * commit '0be8522b430aca8d90023d7c7e5ef510aa48adc7': Bring in more layout lib changes from hc-mr1.
| * | | | | | | am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1abd94f57c0162186c57aea98790e8fa281e0a2': Bring in more layout lib changes from hc-mr1.
| | * | | | | | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe051bb2 : Change the way the layoutlib instantiate its XmlPullParser. A lot of the init code was duplicated so I made a ParserFactory class. Also created an extension of the KXmlPullParser to override toString(). This allows easier debugging when dealing with multiple parsers (which is always the case). Also added some (disabled) debugging printf to deal with parser stack as it can be tricky figuring out which parsers are in the stack at which point. 8969147c : Fix case where the int[] attrs doesn't directly match a styleable. In the case of the FastScroller the int[] is a custom mix of attr instead of a int[] that exists as R.styleable.foo. This makes our reflection based mechanism used to find the styleable fail, so instead we search for each attribute separately (like we probably should have done from the beginning). 0c264b35: Fix various cases of getDimension to report error if unit is missing. if getDimention###() is called for a string that has no unit, then an error is output through LayoutLog, but the rendering keeps going by using dp as a default. 0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt() Only getInt() resolved attribute flags/enum and I'm not sure why there's two to begin with.
* | | | | | | Fix changed native method delegates in layoutlib for ICS.Xavier Ducrohet2011-06-153-6/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49306868cd8a41b6b7d919c3e8b108d5c014530e
* | | | | | | resolved conflicts for merge of 77fc8b80 to masterDianne Hackborn2011-06-141-22/+134
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d
| * | | | | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation ↵Dianne Hackborn2011-06-141-22/+134
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | features." into honeycomb-mr2 * commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0': Add new landscape and portrait orientation features.
| | * | | | | Add new landscape and portrait orientation features.Dianne Hackborn2011-06-141-22/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates aapt to know about these. Also updates aapt badging to: - No longer crash due to the change to how we match unspecified configuration resources. - Report the new "smallest screen" supported screen configs. - Infer old screen size buckets based on new smallest width attrs. - Report all of the different labels and icons in an app. Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
* | | | | | | 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
generated by cgit v1.1 at 2025-02-08 13:09:20 +0000