aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add to layoutlib the ability to simply render a Drawable.Xavier Ducrohet2011-02-0410-62/+250
| | | | | | | | | | | RenderParams is now a base class. SessionParams extends it (and contains the layout and the rendering mode which are not part of the base class). DrawableParams is used for the new action and adds a reference to a ResourceValue. Change-Id: Ieacf4da91fda95df1d25a32ae0953bd9d8028113
* Merge "Add app name/icon and current render locale to the LayoutLib API."Xavier Ducrohet2011-02-0416-56/+172
|\
| * Add app name/icon and current render locale to the LayoutLib API.Xavier Ducrohet2011-02-0416-56/+172
| | | | | | | | | | | | | | | | | | | | | | | | This allows the layoutlib to render system/title/action bars as a window decor like it would look on the device. This can be disabled with RenderParams.setForceNoDecor(). (BTW, Params was renamed RenderParams too) Also minor update to the API by replacing an int with Density since the enum is now accessible to the API and layoutlib. Change-Id: Ic37770a9276d12af90c60199a84b04cb64e7c3a1
* | Merge "Prevent java.lang.ArithmeticException in draw9patch"Tor Norbye2011-02-041-1/+1
|\ \
| * | Prevent java.lang.ArithmeticException in draw9patchTor Norbye2011-02-041-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize the zoom field to 1 instead of the default 0 since I ran into a scenario where a division by an uninitialized zoom caused a divide by zero exception. Exception in thread "AWT-EventQueue-0" java.lang.ArithmeticException: / by zero at com.android.draw9patch.ui.ImageEditorPanel$ImageViewer.checkLockedR egion(ImageEditorPanel.java:894) at com.android.draw9patch.ui.ImageEditorPanel$ImageViewer.access$1800( ImageEditorPanel.java:646) at com.android.draw9patch.ui.ImageEditorPanel$ImageViewer$3.mouseMoved (ImageEditorPanel.java:745) at java.awt.Component.processMouseMotionEvent(Component.java:6397) Change-Id: I7d2252f07458864d591be91636477ace4b520855
* | Merge "draw9patch tool: improving zoom process."Tor Norbye2011-02-041-7/+8
|\ \
| * | draw9patch tool: improving zoom process.Keiji Ariyama2011-02-041-7/+8
| | | | | | | | | | | | Change-Id: Ie4d6408858db5b2bafb76ecb916e6b7c00ba0bb7
* | | Merge "SDK Manager: support extras/vendor/path"Raphael Moll2011-02-0313-105/+355
|\ \ \ | |_|/ |/| |
| * | SDK Manager: support extras/vendor/pathRaphael Moll2011-02-0313-105/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the SDK manager install new extra packages into SDK/extras/vendor/path, creating the folders as needed. Existing extra packages are not moved when they are updated, provided that they keep the same 'vendor' and 'path' attributes in their XML definition. There is also some support for the form SDK/vendor-path/ that was introduced by Tools r8 and r9. SDK Bug: 14493 Change-Id: I28b301a768ea2c8c03573f865520b1b3e85f3868
* | | Reconcile korg and googJean-Baptiste Queru2011-02-030-0/+0
|\ \ \ | |_|/ |/| | | | | Change-Id: I10f6dee5046fcf802d5d09668bd61a79506475ae
| * | Merge "SDK: fix win-sdk build errors, make future errors fatal." into ↵Raphael2011-02-021-3/+7
| |\ \ | | | | | | | | | | | | readonly-korg-master
| | * | SDK: fix win-sdk build errors, make future errors fatal.Raphael2011-02-011-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the shell script to make any error fatal and actually break the build, like it should. Change-Id: Iee86b79c5b12a109ccb92dbc81d586c54ac68b5f
* | | | Merge "Binary XML editor"Xavier Ducrohet2011-02-025-0/+412
|\ \ \ \ | |_|_|/ |/| | |
| * | | Binary XML editorsnpe2011-02-035-0/+412
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change enable to review xml files from the android.jar file. It works so that actually open file from <SDK_HOME>/android-<APILEVEL>/data. The com.android.ide.eclipse.adt.binaryXml (BinaryXMLDescriber) content type associates Android resource xml files to the BinaryXMLMultiPageEditorPart editor. The editor checks if the file is contained in jar and is so, convert editor input to XmlStorageEditorInput that handles corresponding file from Android SDK. Change-Id: I8596f0d3ca5477a12dc25f551243f125f8e6ba7e
* | | Merge "SDK: fix win-sdk build errors, make future errors fatal."Raphael2011-02-021-3/+7
|\ \ \ | |/ / |/| |
| * | SDK: fix win-sdk build errors, make future errors fatal.Raphael2011-02-021-3/+7
|/ / | | | | | | | | | | | | Change the shell script to make any error fatal and actually break the build, like it should. Change-Id: Iee86b79c5b12a109ccb92dbc81d586c54ac68b5f
* | Merge "Add support for CTRL+click on the method in Traceview."Xavier Ducrohet2011-02-015-18/+97
|\ \
| * | Add support for CTRL+click on the method in Traceview.Xavier Ducrohet2011-02-015-18/+97
| | | | | | | | | | | | | | | | | | This will open the method declaration in an editor. Change-Id: I79e160bf565ac563e423132e010b7e51ab531673
* | | Merge "Let the Traceview plug-in open the trace file created through DDMS."Xavier Ducrohet2011-02-0115-22/+293
|\ \ \ | |/ /
| * | Let the Traceview plug-in open the trace file created through DDMS.Xavier Ducrohet2011-02-0115-22/+293
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New DDMS extension: traceviewLauncher. This allows another plug-in (traceview) to provide a way to open traceview file. If this doesn't work it revert to the default behavior of DDMS which is to open the external traceview program. also reverted the extension of traceview file from .atv to .trace because earlier versions of Android would automatically create those files using this extension. Change-Id: I2605ad47e501770ae100da2ace781b1d5d8cebc5
* | Merge "Fix possible NPE in Traceview."Xavier Ducrohet2011-02-011-5/+7
|\ \
| * | Fix possible NPE in Traceview.Xavier Ducrohet2011-02-011-5/+7
| | | | | | | | | | | | Change-Id: I7834a4fee69ae103a5a39416aacea689e2010519
* | | Merge "Fixes problem in "draw9patch tool"."Xavier Ducrohet2011-02-011-5/+29
|\ \ \
| * | | Fixes problem in "draw9patch tool".Keiji Ariyama2011-01-301-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a big PNG image will be loading, HelpPanel hides ImageView. This patch fix that problem. Change-Id: I615705849b475e5b88daae7bef2af92cb5fa0657
* | | | Merge "Make up better class names."Xavier Ducrohet2011-02-017-141/+151
|\ \ \ \ | |_|/ / |/| | |
| * | | Make up better class names.Xavier Ducrohet2011-02-017-141/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaGenerator -> SourceProcessor GeneratorDeltaVisitor -> SourceChangeHandler NonJavaFileBundle -> SourceFileData Change-Id: Idaacbef34007a1af730500d8009241683ee9e37b
* | | | Merge "Put the Traceview plugin UI in an editor instead of a view."Xavier Ducrohet2011-02-014-43/+63
|\ \ \ \ | |/ / / |/| | |
| * | | Put the Traceview plugin UI in an editor instead of a view.Pierre Zurek2011-02-014-43/+63
| | |/ | |/| | | | | | | | | | | | | The editor is associated with the .atv extension (Android TraceView). Change-Id: I5133932804a0c24a52ba53617942c2ca65b9345b
* | | Merge "Improvements to RenderScript support:"Xavier Ducrohet2011-02-018-36/+112
|\ \ \ | |/ / |/| |
| * | Improvements to RenderScript support:Xavier Ducrohet2011-02-018-36/+112
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change dependency file location to be in the gen folder in the same package as the source file. This prevents collisions if there are two classes named the same in different packages or source folders. - Now that the dependency files are visible, track their deletion and force recompilation if this happens - Missing dependency files during generator initialization force a recompilation of the source file. - Prevent packaging from taking .rs, .rsh, and .d files from the source folders. This also impacts the Ant build system. Change-Id: Iede9193f67370e1784bd8ba661198bbf99238074
* | Merge "Add Renderscript support to the ADT builders."Xavier Ducrohet2011-02-0116-79/+603
|\ \
| * | Add Renderscript support to the ADT builders.Xavier Ducrohet2011-01-3116-79/+603
| | | | | | | | | | | | | | | | | | | | | | | | This uses the new JavaGenerator mechanism so that all that's needed is to run llvm-rs-cc on a given list and parsing the dependency file that's created. Change-Id: Ib4928c980422dfe1944bc720c77bf6ae5be4c34a
* | | Merge "Change the JavaGenerator to handle output and dependencies."Xavier Ducrohet2011-01-3115-500/+663
|\ \ \ | |/ /
| * | Change the JavaGenerator to handle output and dependencies.Xavier Ducrohet2011-01-3115-500/+663
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the generator only handled a list of files to compile and a list of files that were removed. Now the Generator provides all that needed to do incremental builders with known state. On top of providing a default deltavisitor it handles file dependency and list of output files. The aidl generator was updated to use this, and the renderscript generator will use the same mechanism. Also fixed the abortOnBadSetup which through CoreException which did nothing to stop later builders (unlike my comments said) and poluted the workspace log with worthless messages. Change-Id: Ib954beb9674f1387c022f926388adb8faf6cdac2
* | Merge "Fix android.bat to support CWD with & character"Raphael Moll2011-01-311-2/+2
|\ \
| * | Fix android.bat to support CWD with & characterRaphael Moll2011-01-311-2/+2
|/ / | | | | | | | | | | SDK Bug: 12862 Change-Id: Ib9508ce384b91a234e33834b19aaff6cc77e8ade
* | Merge "Respect Eclipse classpath when adding files to APK"Xavier Ducrohet2011-01-311-7/+41
|\ \
| * | Respect Eclipse classpath when adding files to APKDominic Mitchell2011-01-311-7/+41
|/ / | | | | | | | | | | | | | | Iterating through the source folder may include files that the user has asked to be ignored. http://code.google.com/p/android/issues/detail?id=12809 Change-Id: I18915cb8868feffe81499276923fec1415076186
* | Merge "Guard against possible NPE."Tor Norbye2011-01-301-1/+1
|\ \
| * | Guard against possible NPE.Tor Norbye2011-01-301-1/+1
| | | | | | | | | | | | Change-Id: I4be9b1659aa1394bea0f24f34fb4681e781b96ae
* | | Merge "Refactor aidl handling in its own class."Xavier Ducrohet2011-01-3018-612/+1180
|\ \ \ | |/ / |/| |
| * | Refactor aidl handling in its own class.Xavier Ducrohet2011-01-3018-612/+1180
| | | | | | | | | | | | | | | | | | | | | It extends a new base class that will serve as a base class for the one handling renderscript files. Change-Id: Ibef0c4b9a792fe52bf7b70bf5d24f76a15cb65c9
* | | Merge "Cluster of improvements for merge tag views"Tor Norbye2011-01-3011-222/+1033
|\ \ \ | |/ / |/| |
| * | Cluster of improvements for merge tag viewsTor Norbye2011-01-3011-222/+1033
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset contains various improvements around usage of the <merge> tag. Some of these fixes require layoutlib 5. * Use the new layoutlib support for rendering multiple children at the root level - they now show up in the Outline (provided you are running layoutlib 5), can be selected in the layout editor, etc. * Add a drop handler such that you can drag into the <merge> view and get drop feedback (similar to the FrameLayout) * If the <merge> is empty, we don't get any ViewInfos, so in that case manufacture a dummy view sized to the screen. Similarly, if we get back ViewInfos that are children of a <merge> tag in the UI model, create a <merge> view initialized to the bounding rectangle of these views and reparent the views to it. * Support highlighting multiple views simultaneously when you select an include tag that renders into multiple views (because the root of the included layout was a <merge> tag). Similarly, make "Show Included In" work properly for <merge> views, and make the overlay mask used to hide all included content also reveal only the primary selected views (when a view is included more than once.) (Also tweak the visual appearance of the mask, and use better icon for the view root in the included-root scenario.) * Improve the algorithm which deals with render results with null keys. Use adjacent children that -do- have keys as constraints when attempting to match up views without keys and unreferenced model nodes. This fixes issue http://code.google.com/p/android/issues/detail?id=14188 * Improve the way we pick views under the mouse. This used to search down the view hierarchy in sibling order. Instead, search in reverse sibling order since this will match what is drawn in the layout. For views like FrameLayout and <merge> views, the children are painted on top of ech other, so clicking on whatever is on top should choose that view, not some earlier sibling below it. * Fix such that when you drag into the canvas, we *always* target the root node, even if it is not under the mouse. This is particularly important with <merge> tags, but this also helps if you for example have a LinearLayout as the root element, and the layout_height property is wrap_content instead of match_parent. In that case, the LinearLayout will *only* cover its children, so if you drag over the visual screen, it looks like you should be able to drop into the layout, but you cannot since it only covers its children. With this fix, all positions outside the root element's actual bounds are also considered targetting the root. * Fix broken unit test, add new unit tests. Change-Id: Id96a06a8763d02845af4531a47fe32afe703df2f
* | Merge "Traceview integration into Eclipse."Xavier Ducrohet2011-01-3019-3/+578
|\ \
| * | Traceview integration into Eclipse.Pierre Zurek2011-01-3019-3/+578
|/ / | | | | | | | | | | New plugin which adds a Traceview view to Eclipse. Change-Id: I3001dfde6ed28db3de8a75715a0ba0743f5c29b0
* | Merge "Fix in PreferencePage."Xavier Ducrohet2011-01-301-0/+6
|\ \
| * | Fix in PreferencePage.Pierre Zurek2011-01-231-0/+6
| |/ | | | | | | | | | | | | | | | | When the user clicked on the "Restored Defaults" button, the "ADBHOST value:" field could still be enabled while the "Use ADBHOST" field was disabled. This commit fixes the problem. Change-Id: Id5948fed655a7034a65cb96b509e1ad80226a93b
* | Merge "Fix for issue 14189."Xavier Ducrohet2011-01-303-13/+74
|\ \
| * | Fix for issue 14189.Pierre Zurek2011-01-293-13/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now the user can set if he wants to change perspective when he double-clicks in the LogCat view. If he wants to change perspective, he can set which perspective shall be opened. Change-Id: I3ed68f3f8ad3bbfcd6d161b63a0c0f218dd778b6