summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency ↵Xavier Ducrohet2011-07-197-18/+110
|\ | | | | | | | | | | | | generation to Aapt for R.java" * commit '9139868b6c5cb29b3665984225dceb0193fec31d': Add dependency generation to Aapt for R.java
| * am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to ↵Xavier Ducrohet2011-07-197-18/+110
| |\ | | | | | | | | | | | | | | | | | | Aapt for R.java" * commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7': Add dependency generation to Aapt for R.java
| | * am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
| | |\ | | | | | | | | | | | | | | | | * commit '82943ecfe2c4266cf3db50326240825fefcaa38f': Add dependency generation to Aapt for R.java
| | | * am d40c93f6: Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85': Add dependency generation to Aapt for R.java
| | | | * Add dependency generation to Aapt for R.javaJosiah Gaskin2011-06-278-19/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Aapt generate a dependency file in the location specified by RClassDir for R.java if the --generate-dependencies flag is set. This dependency file is then read by the ant exec loop task to see whether to recreate R.java. Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
* | | | | am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created ↵Xavier Ducrohet2011-07-193-1/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | R.java into library projects" * commit 'bf31250ba0858a2e72a3906a1f0216846683bc2e': Copy once-created R.java into library projects
| * | | | am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into ↵Xavier Ducrohet2011-07-193-1/+26
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | library projects" * commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9': Copy once-created R.java into library projects
| | * | | am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '2e659ae59c17a0c0584d35b8c400a294c9d49e12': Copy once-created R.java into library projects
| | | * | am 42755155: Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '42755155d6e8ddc3201b08def2bf262a64fa25f2': Copy once-created R.java into library projects
| | | | * Copy once-created R.java into library projectsJosiah Gaskin2011-06-273-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds functionality in Aapt to allow specification of library projects to copy the generated R.java file into rather than regenerating the file for each library project. Change-Id: I05939d1dc875bd875be9298ca47cb639235070c6
| | * | | am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into ↵Xavier Ducrohet2011-06-2812-192/+322
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89': Bring in more layout lib changes from hc-mr1.
| | | * | | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1612-192/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: I015111263d2a2bee76834978ae71eef79defdae3
| | * | | | am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into ↵Xavier Ducrohet2011-06-282-4/+9
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '4753498d5c1ac3cf93b0730e77946a95b6913a82': CherryPick 06942bc4 from hc-mr1. do not merge.
| | | * | | CherryPick 06942bc4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-162-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layoutlib - use the new getParser callback when possible. Change-Id: I72b867aa573fcc07d610f139da3c90b1b654633c
| | * | | | am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into ↵Xavier Ducrohet2011-06-283-16/+49
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | | | | | | | | | | gingerbread * commit '9918ffb07f47430e22f6e53576d59b599f5a3534': CherryPick 988eeeb5 from hc-mr1. do not merge.
| | | * | CherryPick 988eeeb5 from hc-mr1. do not merge.Xavier Ducrohet2011-06-163-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for custom declare-styleable attr with enum/flag in layoutlib. Change-Id: I8a5b7cc629d61996ffade9aabd9d4d10961eb411
* | | | | Enable IMEs to set additional subtypes in backgroundsatok2011-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4591792 Change-Id: I7e61a576c56d1a3a56001bdf2fd51ad3801add01
* | | | | Merge "Fix aidl to cope with multiple collection types per method."Elliott Hughes2011-07-144-111/+110
|\ \ \ \ \
| * | | | | Fix aidl to cope with multiple collection types per method.Elliott Hughes2011-07-134-111/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=18497 Change-Id: I152416022524d2860cb16b46c4812c5be6bdcbad
* | | | | | am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-131-0/+60
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '9163a4a686fc25fefc77d5b41c24a4538486a48e': Merge 36a3a392 from mr1.
| * | | | | am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-111-0/+60
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0': Merge 36a3a392 from mr1.
| | * | | | | Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-111-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect against OOB index in BridgeTypedArray. Change-Id: I40be1e039f9eb36c182b6522bd50d6ed98e15b5c
* | | | | | | LayoutLib: updated fake accessbility manager and ensure there's an ↵Xavier Ducrohet2011-07-125-0/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputMethodManager We had replaced the accessibility Manager but it lacked some new API. Obvisouly this is fragile and should be fixed, but this works for now. After fixing this there was another issue with the lack of InputMethodManager. To fix this I had to create an implementation of IInputMethodManager which normally comes from a binder object. I may want to do a similar trick with the accessibility manager later. Change-Id: I28c6494e333f39072f348d0199124efac93256a5
* | | | | | | LayoutLib: Delegate for Display and IWindowManager implementation.Xavier Ducrohet2011-07-126-20/+639
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows ViewConfiguration to be properly implemented which is now required for the rendering to happen. Change-Id: I55629689fa8f5f874b43fcac2aa0789ce02d58f4
* | | | | | | new button graphics for layoutlib.Xavier Ducrohet2011-07-119-0/+0
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Change-Id: I12a6bf9df87552321452ca3344449814cd3102bb
* | | | | | am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep ↵Raphael Moll2011-06-238-117/+319
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original of delegate methods." * commit 'f9705ef6d3f1502991dd312bfdbfb93cb07fe672': Laoutlib_creator: keep original of delegate methods.
| * | | | | am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate ↵Raphael Moll2011-06-228-117/+319
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | methods." * commit '2b5f2d01558ba338042f486c754f63873c4061fe': Laoutlib_creator: keep original of delegate methods.
| | * | | | am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."Raphael Moll2011-06-228-117/+319
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2': Laoutlib_creator: keep original of delegate methods.
| | | * | | Laoutlib_creator: keep original of delegate methods.Raphael Moll2011-06-178-117/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For specific methods, Layoublib_create can rewrite the implementation of a method to invoke a delegate instead of the original code. This allows layoutlib to implement native code or override existing behavior. This patch also 'saves' the original implementation of a rewritten method so that the delegate can access the original implementation as needed. Obviously this is only done for non-native methods. Given a non-native SomeClass.MethodName, we generate 2 methods: - A copy of the original method named "SomeClass.MethodName_original". The content is the original method as-is from the reader. - A brand new implementation of SomeClass.MethodName which calls to a non-existing method named "SomeClass_delegate.MethodName". The implementation of this 'delegate' method is done in layoutlib_brigde. Change-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6
| | * | | | am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into ↵Xavier Ducrohet2011-06-063-0/+86
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'd6ce6791f26fd0a7cf89ded2847011a4894013e1': Cherrypick d1ed33c4 from hc-mr1. do not merge.
| | | * | | Cherrypick d1ed33c4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-033-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix zombie threads in the Layoutlib. Some widgets can create (indirectly) HandlerThread which are started but never stopped. This patch use the delegate methods to override the thread run method to record which threads are started to be able to call quit() on them after a render. Note that we should really fix layoutlib_create to be able to call the default implementation from a delegate to remove code duplication. Change-Id: Iaf5432623e9704bb3114a8e0583c8553282c205e
| | * | | | am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbreadXavier Ducrohet2011-06-069-18/+15
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee1b497648a0c3c03b09c4739619f23315d491fb': Cherrypick 5b61ea6b from hc-mr1 LayoutLib: enable the LAYOUT_ONLY capability. Merge dba35f1b from honeycomb-mr1. do not merge.
| | | * | | Cherrypick 5b61ea6b from hc-mr1Xavier Ducrohet2011-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix drawCircle in layoutlib. Change-Id: I035c48b925cad246ed821e9e59a93d37174982ef
| | | * | | LayoutLib: enable the LAYOUT_ONLY capability.Xavier Ducrohet2011-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib302af47d2a83a7ac3def6256bf0b892823f594f
| | | * | | 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
|\ \ \ \ \ \ \