aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Typo.Kenji Tan2011-06-011-1/+1
|/ / / | | | | | | | | | | | | | | | Fixed a typo. "Diplay" should read "Display". Change-Id: I8b20e1c76e686e9ab5fa8ba9f8cee9a2ad1cd2a7
* | | Merge "Move rendering code into RenderService class"Tor Norbye2011-06-015-366/+579
|\ \ \
| * | | Move rendering code into RenderService classTor Norbye2011-06-015-366/+579
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL moves the various rendering-related code in GraphicalEditorPart into a separate RenderService class, which can be configured for different purposes: - Rendering a layout shown in the canvas - Rendering palette previews - Rendering a preview of a node during a drag from a palette - Rendering a theme drawable - Rendering layout-only to measure preferred sizes Once configured, the rendering service can be used repeatedly and off the UI thread to for example render all the palette previews without blocking editor startup. This will be addressed in a follow-up CL. Change-Id: I851148d80c3a4dc9e4b5b66c9838ae49809ea03c
* | | | Merge "Resize & Guideline Support"Tor Norbye2011-06-0163-847/+5024
|\ \ \ \ | |/ / /
| * | | Resize & Guideline SupportTor Norbye2011-06-0163-847/+5024
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelativeLayout now has both drop/move and resize guidelines, and existing constraints are visualized for the selection. LinearLayout resizing now uses weights to change the size of nodes rather than setting width/height. All resize operations offer guidelines to snap to their "wrap_content" size. Various bug fixes in related areas as well. Change-Id: I817e34c6e67ce61cfb137eb067076d91f69f99e9
* | | | Merge "Add Resize Support to the Layout Editor"Tor Norbye2011-06-0122-79/+1209
|\ \ \ \ | |/ / /
| * | | Add Resize Support to the Layout EditorTor Norbye2011-06-0122-79/+1209
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds "resizing" support to the layout editor. First, the normal selection overlay is replaced with a selection rectangle which also has "selection handles" in the corners and in the middle of each edge. Moving the cursor over one of the selection handle will show a directional resize cursor, and dragging the handle will initiate a new resizing gesture. (This also made it possible to remove the selection fill we've used until now, so the layout editor will "interfere" less with the visual look of the layout.) During the resizing operation, the current size is displayed in the Eclipse status bar. The resizability of widgets is determined by metadata, so for example a ZoomControls widget is not resizable, a rating bar is only horizontally resizable, a TableRow is only vertically resizable, and most widgets are resizable in any direction. The parent layout is involved in the resizing operation. Currently, the resizing gestures will only update the width and height properties (except for absolute layout, which will also set the x and y properties if you are dragging a left or top edge). In a follow up changeset this will be extended to for example make RelativeLayout allow resize dragging to snap to new edges and the resize will be applied as a set of new constraints on the "resized" widget. Thus, you'll be able to drag the right hand side of a widget and drag it over to attach to some other widget or edge, independent of what the left edge or vertical edges are bound to. This changeset also adds the ability for ViewRules to provide a message or error message back to the IDE during a drag or resize operation. For resizing this is used to display the new size. However, it is now also used to display more useful messages in a couple of older scenarios: * Attempting to drag anything into a ListView will display a message that AdapterViews much be configured via Java code * Attempting to drag anything into or within an AbsoluteLayout will warn that AbsoluteLayouts are deprecated. Note that resizing will currently set the size to specific pixel (dip) sizes. In the next changeset I will add guidelines which (in addition to those described for RelativeLayout above) will add guidelines for significant sizes such as the parent size, the preferred (wrap_content) size of the widget, and possibly other hardcoded sizes in the same layout. Change-Id: Ie4f3367e81b24259a106c649c944008f4a3d31ec
* | | Merge "SdkMan2: fix package deletion."Raphael Moll2011-05-311-13/+21
|\ \ \
| * | | SdkMan2: fix package deletion.Raphael Moll2011-05-311-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2 minor fixes: - make it possible to delete a local package even if it has updates available. - refresh the local sdk parser after installing/deleting packages to make sure we're not showing an obsolete state. Change-Id: If3aa197cdd16f414133ce6af09696c2676cb02ac
* | | | Merge "SdkMan2: fix Android platform name display."Raphael Moll2011-05-311-2/+21
|\ \ \ \ | |/ / /
| * | | SdkMan2: fix Android platform name display.Raphael Moll2011-05-311-2/+21
|/ / / | | | | | | | | | Change-Id: Ifb280a90fba3a7ecd5eb41ef8b4dd152a480d12a
* | | Merge "SdkManager: Refactor name of UpdaterWindow."Raphael Moll2011-05-3117-86/+85
|\ \ \
| * | | SdkManager: Refactor name of UpdaterWindow.Raphael Moll2011-05-2717-86/+85
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the sdkmanager now contains separate windows for the "SDK Updater" versus the "AVD Manager", the various UpdaterWindow classes are renamed to SdkUpdateWindow. We already have now a standalone AvdManagerWindow that matches this pattern. This is a pure refactoring/renaming CL with no workflow change whatsoever. Change-Id: I18ecb6aa33b7e9bd2294a959b371b424d03b2060
* | | Merge "AvdManager1: remove unused code."Raphael Moll2011-05-272-12/+1
|\ \ \
| * | | AvdManager1: remove unused code.Raphael Moll2011-05-272-12/+1
|/ / / | | | | | | | | | Change-Id: Id2f2b65d25403d57d68cb2257bc19723790ad82b
* | | Merge "SdkMan2: don't use yellow background anymore."Raphael Moll2011-05-271-25/+1
|\ \ \
| * | | SdkMan2: don't use yellow background anymore.Raphael Moll2011-05-271-25/+1
| | | | | | | | | | | | | | | | Change-Id: I9bcc54b58ab717d22d881bd36d38d7594a175214
* | | | Merge "New standalone AVD Manager window."Raphael Moll2011-05-275-13/+653
|\ \ \ \
| * | | | New standalone AVD Manager window.Raphael Moll2011-05-245-13/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the the current "AVD Manager" page wrapped as a window so that it can be used either in standalone or from the new SDK Manager 2. Change-Id: Id6272ca87481890809e483eee6d57e715d8ad517
* | | | | Merge "[EXTERNALIZATION] This commit externalizes the strings of the DDMS ↵Xavier Ducrohet2011-05-2715-262/+565
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | plugin."
| * | | | [EXTERNALIZATION] This commit externalizes the strings of the DDMS plugin.Pablo Leite2011-05-2715-262/+565
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After applying it, please run the Eclipse's Externalize Wizard at “Source -> Externalize Strings…”. This ensure that hard-coded strings added between the time the patch was created and the time it was integrated will also be externalized. From the time this patch is integrated on, each new string created in the plugin should be added to the following files: eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/i18n/messages.properties Example: JavaClassName_MessageID=<string value> <string value> refers to the string itself. eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/i18n/Messages.java Example: public static String JavaClassName_MessageID; In the Java class, the new string should be referenced this way: Messages.JavaClassName_MessageID Related patches: All patches with the [EXTERNALIZATION] tag Changes after review: Code formatted according using android code formatter template Merged Strings DeviceView_Unable_Create_HPROF_For_Application and DeviceView_Unable_Create_HPROF_For_Application. Removed Motorola copyright notices. Change-Id: Id889db593ef313760515f28b5973d3a9a8ad80d0
* | | | Merge "Fixed MonkeyRunner to work with PyDev."Bill Napier2011-05-261-1/+4
|\ \ \ \
| * | | | Fixed MonkeyRunner to work with PyDev.Michael Wright2011-05-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse passes the -u option to MonkeyRunner by default. Since we don't do anything with that option, we can just ignore it. Bug: 4109883 Change-Id: If3624c13583f639e745742f100a0e31e1ab694ad
* | | | | Merge "Fixed MonkeyRunner startup script for manual build"Bill Napier2011-05-261-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed MonkeyRunner startup script for manual buildMichael Wright2011-05-261-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the monkeyrunner startup script to include the proper SWT directory when monkeyrunner is started after a manual build (i.e. not from the prebuilt SDK) Change-Id: Ide8fa6949bba6f2e024ac69f8dd235795dab2a6a
* | | | Merge "Repository XML for R12: layoutlib version for addons."Raphael Moll2011-05-2611-76/+270
|\ \ \ \
| * | | | Repository XML for R12: layoutlib version for addons.Raphael Moll2011-05-2511-76/+270
| | | | | | | | | | | | | | | | | | | | Change-Id: I5e68225ae8fb12a845e1eeec7412bf0bf7d9d676
* | | | | Merge "Default render target level should consider project target"Tor Norbye2011-05-262-8/+46
|\ \ \ \ \
| * | | | | Default render target level should consider project targetTor Norbye2011-05-262-8/+46
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When picking the default render target, we attempt to pick a render target that is at least version 5 of layoutlib (where rendering fidelity has improved significantly, where include support is improved, etc.) However, this sometimes picked a render target whose API level is lower than the project target. This CL fixes that problem, and also improves the detection of compatible layout libraries to not only consider API level 11 or higher, but also the new layoutlib API property which will identify qualified SDK versions when we release backported versions of layout lib. Change-Id: I4d4159389692d984a66856eeb80035a8e8b7d1cf
* | | | | Merge "Fix ADT-test"Xavier Ducrohet2011-05-251-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix ADT-testXavier Ducrohet2011-05-251-0/+4
|/ / / / | | | | | | | | | | | | Change-Id: Iebc29d774747ba64f1f895cd36970330145fd6b4
* | | | Merge "Add support for addon providing their own layoutlib and/or res."Xavier Ducrohet2011-05-2510-18/+111
|\ \ \ \
| * | | | Add support for addon providing their own layoutlib and/or res.Xavier Ducrohet2011-05-2510-18/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During addon parsing, the SDK Manager will detect whether the addon has: - data/layoutlib.jar - data/res/ - data/fonts/ if the first one is present, then it is used during rendering. if *both* the 2nd and 3rd ones are present, then addon resources are used during rendering. On the GLE side, all that's needed is adding addons to the list of rendering targets if they have either library or resources (or both). Change-Id: Id16925eea2c98b9fbaaa884ac6fd8c1c1c444db2
* | | | | Merge "Fix flaky SdkRepository test."Raphael Moll2011-05-253-22/+45
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix flaky SdkRepository test.Raphael Moll2011-05-253-22/+45
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like class.getResourceAsStream throws a NullPointerException on the test machines whereas it returns null (as documented) other times when the resource is not found. This patch refactors 2 duplicated getXsdStream methods in the base RepoConstants and adjusts to take both behaviors into account. Change-Id: Ieefd92a006efda30828b8043e39f6b7e904bc53f
* | | | Merge "Prevent 'make sdk_repo' from picking up future schemas."Raphael Moll2011-05-245-2/+43
|\ \ \ \
| * | | | Prevent 'make sdk_repo' from picking up future schemas.Raphael Moll2011-05-245-2/+43
|/ / / / | | | | | | | | | | | | Change-Id: I749f4727b4c257ef5a6177b05727f5944d5d81ed
* | | | Merge "New Repository XSD for R12."Raphael Moll2011-05-2418-28/+2116
|\ \ \ \ | |/ / / |/| | |
| * | | New Repository XSD for R12.Raphael Moll2011-05-2418-28/+2116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This add a new schema sdk-repository-4 with the following changes: - <extra> element now has a <project-files> element that contains 1 or or more <path>, each indicating the relative path of a file that this package can contribute to installed projects. - <platform> element now has a mandatory <layoutlib> that indicates the API and revision of that layout library for this particular platform. There's also a matching sdk-addon-2 schema with the same modification to the <extra> element. Change-Id: Id74a5d09dfa36d65f11b9d60a82fe8ba4119eb34
* | | | Merge "Prevent NPE when server is not running."Xavier Ducrohet2011-05-241-2/+5
|\ \ \ \
| * | | | Prevent NPE when server is not running.Romain Guy2011-05-241-2/+5
|/ / / / | | | | | | | | | | | | Change-Id: Iea1ba8fd78aca61611e73a29fe8b08b96783b248
* | | | Merge "Use sdklib.OsHelper in AddCompatibilityJarAction."Raphael Moll2011-05-244-122/+81
|\ \ \ \ | |_|/ / |/| | |
| * | | Use sdklib.OsHelper in AddCompatibilityJarAction.Raphael Moll2011-05-244-122/+81
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADT's AddCompatibilityJarAction defined 2 new generic useful methods, copyFile and isSameFile. SdkLib already had an OsHelper.copyFile, so I moved that class to a more generic sdklib.io package and added the new method isSameFile. Another suitable candidate would have been io.FileWrapper in the common project. Change-Id: If310e09af112c5f4d87a253b35e67e4f5adb34da
* | | merge from tools-adt_r11The Android Open-Source Project2011-05-240-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I45f882507745c3375e2fed88a9f401e4ddc1adda
| * \ \ Merge "Don't apply default attributes in a move/copy. DO NOT MERGE" into ↵Tor Norbye2011-05-243-8/+23
| |\ \ \ | | | | | | | | | | | | | | | tools-adt_r11
| | * | | Don't apply default attributes in a move/copy. DO NOT MERGETor Norbye2011-05-243-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a method in the layout editor which fills in required default attributes like id, width and height, as well as some optional attributes like a default text attribute. This code was called unconditionally whenever a new child is added to a layout. However, this should only be done when a new widget is created, not during moves or copies from existing elements. Change-Id: I2b437ef609a168f1bb1b7698d3a954a4d2f5faa0
| * | | | Merge "Disable palette preview for some widgets on some platforms. DO NOT ↵Tor Norbye2011-05-242-1/+44
| |\ \ \ \ | | |/ / / | |/| | | | | | | | MERGE" into tools-adt_r11
| | * | | Disable palette preview for some widgets on some platforms. DO NOT MERGETor Norbye2011-05-242-1/+44
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ListView palette preview requires adapterview support in layoutlib, and DatePicker and TimePicker require Holo themes on Honeycomb. This changeset adds some conditional logic to the palette preview code to drop rendering of these widgets based on the current render target, layout library and theme. Change-Id: I3ed30682485655ca7463baa8ea1133fddebe7091
* | | | Merge "Don't apply default attributes in a move/copy"Tor Norbye2011-05-243-8/+23
|\ \ \ \
| * | | | Don't apply default attributes in a move/copyTor Norbye2011-05-243-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a method in the layout editor which fills in required default attributes like id, width and height, as well as some optional attributes like a default text attribute. This code was called unconditionally whenever a new child is added to a layout. However, this should only be done when a new widget is created, not during moves or copies from existing elements. Change-Id: Ic04dec746c70359eca38454bacfdcdb87891719f