OSDN Git Service

android-x86/sdk.git
13 years agoADT: Update changelog for ADT 8.0.1
Xavier Ducrohet [Tue, 7 Dec 2010 20:16:53 +0000 (12:16 -0800)]
ADT: Update changelog for ADT 8.0.1

Change-Id: I7133aa293b2d1e0ef3ba65f8ec91fb95cda4ee66

13 years agoMerge "New test project for Eclipse: referencing java projects."
Xavier Ducrohet [Tue, 7 Dec 2010 05:02:36 +0000 (21:02 -0800)]
Merge "New test project for Eclipse: referencing java projects."

13 years agoMerge "Update test apps and bundle them in the meta sdk."
Xavier Ducrohet [Tue, 7 Dec 2010 05:02:25 +0000 (21:02 -0800)]
Merge "Update test apps and bundle them in the meta sdk."

13 years agoNew test project for Eclipse: referencing java projects.
Xavier Ducrohet [Tue, 7 Dec 2010 00:56:44 +0000 (16:56 -0800)]
New test project for Eclipse: referencing java projects.

Change-Id: I4ac4f89ad4c40c0073d7c24662f5a8e8740b696a

13 years agomerge from tools_r8
The Android Open Source Project [Tue, 7 Dec 2010 01:01:19 +0000 (17:01 -0800)]
merge from tools_r8

Change-Id: Id9fb9a21e526a1f3becef3a44573d54868465348

13 years agoMerge "cherry pick: Fix issue with referenced Java Project." into tools_r8
Xavier Ducrohet [Tue, 7 Dec 2010 01:00:14 +0000 (17:00 -0800)]
Merge "cherry pick: Fix issue with referenced Java Project." into tools_r8

13 years agocherry pick: Fix issue with referenced Java Project.
Xavier Ducrohet [Tue, 7 Dec 2010 00:23:25 +0000 (16:23 -0800)]
cherry pick: Fix issue with referenced Java Project.

Also improve slightly DX error reporting.

This is cherry-picked from master.

Change-Id: Iaaca9625575d87a607b21bf81636315820d76c2c

13 years agoMerge "Fix issue with referenced Java Project."
Xavier Ducrohet [Tue, 7 Dec 2010 00:49:19 +0000 (16:49 -0800)]
Merge "Fix issue with referenced Java Project."

13 years agoFix issue with referenced Java Project.
Xavier Ducrohet [Tue, 7 Dec 2010 00:23:25 +0000 (16:23 -0800)]
Fix issue with referenced Java Project.

Also improve slightly DX error reporting.

Change-Id: I2f84f74efb9695db732ac188bd37e62bfdb533c5

13 years agoMerge "ADT: Make ExtractString work on unsaved buffers."
Raphael Moll [Tue, 7 Dec 2010 00:06:58 +0000 (16:06 -0800)]
Merge "ADT: Make ExtractString work on unsaved buffers."

13 years agoMerge "Cleanup refactoring."
Raphael Moll [Tue, 7 Dec 2010 00:04:27 +0000 (16:04 -0800)]
Merge "Cleanup refactoring."

13 years agoUpdate test apps and bundle them in the meta sdk.
Xavier Ducrohet [Mon, 6 Dec 2010 23:52:43 +0000 (15:52 -0800)]
Update test apps and bundle them in the meta sdk.

- make it so that layout display something about the project,
  and possibly the result of calling out to class coming from jar files.
- make the activity names on the launcher to be the name of the projects.

Change-Id: I318255c3284337be28220df509630cfff4eae38b

13 years agoMerge "Change context menu label from "Clear" to "Default""
Tor Norbye [Mon, 6 Dec 2010 23:42:11 +0000 (15:42 -0800)]
Merge "Change context menu label from "Clear" to "Default""

13 years agoADT: Make ExtractString work on unsaved buffers.
Raphael Moll [Mon, 6 Dec 2010 21:04:18 +0000 (13:04 -0800)]
ADT: Make ExtractString work on unsaved buffers.

This also improves the ability to change XML strings in
any XML file, including the manifest. Also fixes some
edge cases related to that new ability.

Change-Id: I8441785ec7849272f6e9169bd5545cba5e8128d4

13 years agoCleanup refactoring.
Raphael Moll [Mon, 6 Dec 2010 22:13:22 +0000 (14:13 -0800)]
Cleanup refactoring.

Change-Id: I5641a9238129558b269c3f8a27a5b4de54e9db44

13 years agoChange context menu label from "Clear" to "Default"
Tor Norbye [Mon, 6 Dec 2010 17:24:11 +0000 (09:24 -0800)]
Change context menu label from "Clear" to "Default"

The property context menus in the layout editor lets you choose
between True and False (for booleans), and between the various
possible enum values for enum properties. You can also reset the
values back to whatever the defaults were.

The menu label for this was "Clear". This changeset changes this to
"Default" instead, since "Clear" sounds more like an action than a
persistent choice among many, and when this option is chosen you are
removing a local override of the property and picking up whatever the
default is.

Change-Id: Id3ea9618612ac44e2b965e77c9e84751364cf813

13 years agoMerge "Fix ant rules"
Xavier Ducrohet [Mon, 6 Dec 2010 19:33:07 +0000 (11:33 -0800)]
Merge "Fix ant rules"

13 years agoMerge "Issue 6894: Eclipse ADT layout editor can't handle custom Views: ClassCastEx...
Xavier Ducrohet [Mon, 6 Dec 2010 18:56:55 +0000 (10:56 -0800)]
Merge "Issue 6894:   Eclipse ADT layout editor can't handle custom Views: ClassCastException (multiple ClassLoaders?)"

13 years agoFix ant rules
Xavier Ducrohet [Mon, 6 Dec 2010 18:48:57 +0000 (10:48 -0800)]
Fix ant rules

- utf-8 is default encoding for java files.
- make encoding, target, source also overridable in the lib rules.

Change-Id: I95a6dfd2a815ea9994638c0a0270381819b75a12

13 years agoMerge "LayoutLib API: new log API + updated SceneStatus API."
Xavier Ducrohet [Mon, 6 Dec 2010 18:26:21 +0000 (10:26 -0800)]
Merge "LayoutLib API: new log API + updated SceneStatus API."

13 years agoLayoutLib API: new log API + updated SceneStatus API.
Xavier Ducrohet [Mon, 6 Dec 2010 18:05:08 +0000 (10:05 -0800)]
LayoutLib API: new log API + updated SceneStatus API.

Change-Id: I8fe107397c2322cca979e7953d2be5933a59d0bf

13 years agoMerge "ADT: Add support for some new resource types."
Xavier Ducrohet [Mon, 6 Dec 2010 18:04:58 +0000 (10:04 -0800)]
Merge "ADT: Add support for some new resource types."

13 years agoADT: Add support for some new resource types.
Xavier Ducrohet [Sat, 4 Dec 2010 02:59:49 +0000 (18:59 -0800)]
ADT: Add support for some new resource types.

They are not technically new, but we never really
needed them. Turns out we do now (some are used by some widgets).

Also added an assert to detect new types of resources, and a test
to make sure that all resource types and folder types are added
to the folder-res relationship maps.

Change-Id: Ie4b6786ea6de9c69776794750732303b8d68b7bb

13 years agoMerge "LayoutLib API: SceneResult API clean up."
Xavier Ducrohet [Fri, 3 Dec 2010 20:05:02 +0000 (12:05 -0800)]
Merge "LayoutLib API: SceneResult API clean up."

13 years agoLayoutLib API: SceneResult API clean up.
Xavier Ducrohet [Fri, 3 Dec 2010 18:48:32 +0000 (10:48 -0800)]
LayoutLib API: SceneResult API clean up.

Change-Id: I1cb80da55f9ff16d0422eb6c4767448a4691b74b

13 years agoMerge "Fix drop into ScrollView"
Tor Norbye [Fri, 3 Dec 2010 05:09:38 +0000 (21:09 -0800)]
Merge "Fix drop into ScrollView"

13 years agoMerge "LayoutLib API: add capability query."
Xavier Ducrohet [Fri, 3 Dec 2010 01:45:49 +0000 (17:45 -0800)]
Merge "LayoutLib API: add capability query."

13 years agoLayoutLib API: add capability query.
Xavier Ducrohet [Fri, 3 Dec 2010 01:42:03 +0000 (17:42 -0800)]
LayoutLib API: add capability query.

Also add a map of new layout params attribute when moving
views from one parent to another.

Change-Id: If12d861d29f1bb0ec59c15d85439630ebdad4b82

13 years agoMerge "Contribute android changes to Rename package, Rename Type and Move Type Java...
Raphaël Moll [Fri, 3 Dec 2010 00:13:02 +0000 (16:13 -0800)]
Merge "Contribute android changes to Rename package, Rename Type and Move Type Java refactoring"

13 years agoMerge "LayoutLib API: fixed wrong camelcase in API."
Xavier Ducrohet [Thu, 2 Dec 2010 20:25:04 +0000 (12:25 -0800)]
Merge "LayoutLib API: fixed wrong camelcase in API."

13 years agoLayoutLib API: fixed wrong camelcase in API.
Xavier Ducrohet [Thu, 2 Dec 2010 20:24:22 +0000 (12:24 -0800)]
LayoutLib API: fixed wrong camelcase in API.

Change-Id: Iddc8681b841d445747f583380c136310d64c41fc

13 years agoMerge "LayoutLib API: move add/moveChild API back to using index."
Xavier Ducrohet [Thu, 2 Dec 2010 20:10:02 +0000 (12:10 -0800)]
Merge "LayoutLib API: move add/moveChild API back to using index."

13 years agoLayoutLib API: move add/moveChild API back to using index.
Xavier Ducrohet [Thu, 2 Dec 2010 19:53:05 +0000 (11:53 -0800)]
LayoutLib API: move add/moveChild API back to using index.

Also add an optional data bundle to SceneResult.

Change-Id: I9f9d4ca1f1f05d536a87a005a7939a6d42d0d8a4

13 years agoContribute android changes to Rename package, Rename Type and Move Type Java refactoring
snpe [Sat, 4 Sep 2010 11:18:18 +0000 (13:18 +0200)]
Contribute android changes to Rename package, Rename Type and Move Type Java refactoring

Change-Id: Iad4dd015eb2164dcd888a96bafa256d89711d49d

13 years agoMerge "Fix 9-patch padding"
Xavier Ducrohet [Thu, 2 Dec 2010 18:22:53 +0000 (10:22 -0800)]
Merge "Fix 9-patch padding"

13 years agoMerge "LayoutLib API: New SceneStatus enum."
Xavier Ducrohet [Thu, 2 Dec 2010 18:22:34 +0000 (10:22 -0800)]
Merge "LayoutLib API: New SceneStatus enum."

13 years agoFix drop into ScrollView
Tor Norbye [Thu, 2 Dec 2010 17:10:53 +0000 (09:10 -0800)]
Fix drop into ScrollView

Dragging something into a ScrollView wasn't working,
because a ScrollView was not inheriting layout behavior
from its parent rule.

Change-Id: Id8c11fb033921d86a57d0f34bd7c677dbe229cac

13 years agoFix 9-patch padding
Xavier Ducrohet [Thu, 2 Dec 2010 03:00:20 +0000 (19:00 -0800)]
Fix 9-patch padding

Forgot to change one line that test against 1 for
left index, when lines now start at 0.

Change-Id: Ib9a7779d8fd70b3b0c6b243bf67d77aa986b13a6

13 years agoLayoutLib API: New SceneStatus enum.
Xavier Ducrohet [Thu, 2 Dec 2010 02:25:36 +0000 (18:25 -0800)]
LayoutLib API: New SceneStatus enum.

Change-Id: I1c2ac6ddcabe1faeffe3753735b9f87fde683fd3

13 years agoMerge "Layoutlib API: updated API for insert/move/remove child."
Xavier Ducrohet [Thu, 2 Dec 2010 00:00:52 +0000 (16:00 -0800)]
Merge "Layoutlib API: updated API for insert/move/remove child."

13 years agoLayoutlib API: updated API for insert/move/remove child.
Xavier Ducrohet [Wed, 1 Dec 2010 23:17:07 +0000 (15:17 -0800)]
Layoutlib API: updated API for insert/move/remove child.

Also added some new SceneStatus enums.

Change-Id: I225c58201d81cb1109d1d533fea48b6eacb2e286

13 years agoMerge "ADT: The image given to layoutlib now shares data with ImageData"
Xavier Ducrohet [Wed, 1 Dec 2010 18:43:11 +0000 (10:43 -0800)]
Merge "ADT: The image given to layoutlib now shares data with ImageData"

13 years agoMerge "ADT: fix java/class name mismatch."
Raphael Moll [Wed, 1 Dec 2010 04:07:08 +0000 (20:07 -0800)]
Merge "ADT: fix java/class name mismatch."

13 years agoMerge "ADT: cleanup RenamePackage action."
Raphael Moll [Wed, 1 Dec 2010 03:55:19 +0000 (19:55 -0800)]
Merge "ADT: cleanup RenamePackage action."

13 years agoADT: The image given to layoutlib now shares data with ImageData
Xavier Ducrohet [Tue, 30 Nov 2010 22:57:49 +0000 (14:57 -0800)]
ADT: The image given to layoutlib now shares data with ImageData

We now create a custom BufferedImage that also includes a reusable
ImageData to generate SWT images. While there is still the AWT to
SWT conversion, at least most buffers aren't re-allocated every
time during animation. The only new allocation is the one done
in the Image constructor to pass the ImageData content to the native
image object.

This also fixes the tearing issue introduced in the previous
commit by calling ImageOverlay.setImage from the animation
listener callback. This should not be done in the UI thread
runnable as each rendering reuse the same bitmap.
When the animation listener callback returns, the image
will be reused for a new rendering so it's content will
change.

Also fixes the windows rendering by computing the proper
band offset based on the SWT palette Data.

Change-Id: Id57a3696bd92441271f6bee9681edefd12140b02

13 years agoMerge "ADT/Layoutlib: New API to let the caller instantiate the bitmap."
Xavier Ducrohet [Tue, 30 Nov 2010 23:01:03 +0000 (15:01 -0800)]
Merge "ADT/Layoutlib: New API to let the caller instantiate the bitmap."

13 years agoADT/Layoutlib: New API to let the caller instantiate the bitmap.
Xavier Ducrohet [Tue, 30 Nov 2010 01:49:19 +0000 (17:49 -0800)]
ADT/Layoutlib: New API to let the caller instantiate the bitmap.

This allows us to use a bitmap more compatible with SWT.

In ADT's case, because the bitmap needs to be converted to SWT
before being displayed, we create a BufferedImage using a byte[]
instead of a int[] so that we can simply do an array copy.

Also, we reuse the generated BufferedImage unless the size changed,
which lets us see less GC during animation playback.

Change-Id: I0062a4f4442ff6469cf0ad4f501c1fbe8c719400

13 years agoADT: fix java/class name mismatch.
Raphael Moll [Tue, 30 Nov 2010 22:43:55 +0000 (14:43 -0800)]
ADT: fix java/class name mismatch.

Change-Id: Id0e539be1873904245f50b3bcd861f171360a990

13 years agoMerge "Move WST doc to sdk/docs."
Raphael Moll [Tue, 30 Nov 2010 20:15:04 +0000 (12:15 -0800)]
Merge "Move WST doc to sdk/docs."

13 years agoMove WST doc to sdk/docs.
Raphael Moll [Mon, 29 Nov 2010 23:30:07 +0000 (15:30 -0800)]
Move WST doc to sdk/docs.

Change-Id: I53d7838b557da43a9194ddb13ec1bcd0f1119a36

13 years agoMerge "ADT string refactoring: replace in all files."
Raphael Moll [Tue, 30 Nov 2010 20:14:10 +0000 (12:14 -0800)]
Merge "ADT string refactoring: replace in all files."

13 years agoADT string refactoring: replace in all files.
Raphael Moll [Sun, 28 Nov 2010 07:18:24 +0000 (23:18 -0800)]
ADT string refactoring: replace in all files.

When doing an extract string either from Java or XML:
- can scan/replace in all other Java files.
- can scan/replace in all other XML files.
- in Java, also replace in assignements.
- in XML, also replace existing string name if already defined.

Change-Id: Ifeef5fd444c2c18b9c071955b8e8567d6515ea95

13 years agoMerge "Replace reflection with Sdk.makeRelativeTo"
Tor Norbye [Tue, 30 Nov 2010 19:37:08 +0000 (11:37 -0800)]
Merge "Replace reflection with Sdk.makeRelativeTo"

13 years agoReplace reflection with Sdk.makeRelativeTo
Tor Norbye [Tue, 30 Nov 2010 17:05:11 +0000 (09:05 -0800)]
Replace reflection with Sdk.makeRelativeTo

Replace reflection-based invocation of IPath.makeRelativeTo
(which is not available in Eclipse 3.4) with usage of
Sdk.makeRelativeTo, our own copy of the equivalent code.

Change-Id: If67d985b96b845d85cf7fc13d47e9adeee49e8a8

13 years agoMerge "The rendering target mode should be preserved across IDE sessions"
Tor Norbye [Tue, 30 Nov 2010 18:52:33 +0000 (10:52 -0800)]
Merge "The rendering target mode should be preserved across IDE sessions"

13 years agoThe rendering target mode should be preserved across IDE sessions
Tor Norbye [Mon, 29 Nov 2010 23:38:05 +0000 (15:38 -0800)]
The rendering target mode should be preserved across IDE sessions

This changeset fixes the bug where the rendering target is not
preserved across IDE sessions the way the other configuration settings
seem to be.

Change-Id: I56fc82b1de18c162f62e80d1ba96b54d697b2607

13 years agoMerge "ADT: more animation stuff."
Xavier Ducrohet [Tue, 30 Nov 2010 01:57:25 +0000 (17:57 -0800)]
Merge "ADT: more animation stuff."

13 years agoADT: more animation stuff.
Xavier Ducrohet [Mon, 29 Nov 2010 19:45:47 +0000 (11:45 -0800)]
ADT: more animation stuff.

Change-Id: I020342a4fe205161328f22e9dabb0b03343677b5

13 years agoMerge "Rename some layout editor classes"
Tor Norbye [Tue, 30 Nov 2010 01:07:24 +0000 (17:07 -0800)]
Merge "Rename some layout editor classes"

13 years agoRename some layout editor classes
Tor Norbye [Mon, 29 Nov 2010 23:54:33 +0000 (15:54 -0800)]
Rename some layout editor classes

This changeset contains only renaming of some classes (and a couple
of >100 column adjustments), no semantic changes.

The name changes are:

BaseView => BaseViewRule
BaseLayout => BaseLayoutRule
ScaleInfo => CanvasTransform
CanvasSelection => SelectionItem
PropertySheetPage2 => PropertySheetPage
OutlinePage2 => OutlinePage

Change-Id: I14d8c711b12154f4fcb2169129fd553e31fdab84

13 years agoMerge "ADT: rework extract string refactoring."
Raphael Moll [Mon, 29 Nov 2010 23:23:39 +0000 (15:23 -0800)]
Merge "ADT: rework extract string refactoring."

13 years agomerge from tools_r8
The Android Open Source Project [Mon, 29 Nov 2010 23:19:12 +0000 (15:19 -0800)]
merge from tools_r8

Change-Id: I7553de468542889488ac4dba53a23ae876ff5526

13 years agoMerge "Win SDK: Split the win-sdk makefile and script into 2 parts. DO NOT MERGE...
Raphael Moll [Mon, 29 Nov 2010 23:07:35 +0000 (15:07 -0800)]
Merge "Win SDK: Split the win-sdk makefile and script into 2 parts. DO NOT MERGE." into tools_r8

13 years agoWin SDK: Split the win-sdk makefile and script into 2 parts. DO NOT MERGE.
Raphael Moll [Fri, 12 Nov 2010 00:03:07 +0000 (16:03 -0800)]
Win SDK: Split the win-sdk makefile and script into 2 parts. DO NOT MERGE.

[Merge Change Ic94d261b from master_open into tools_r8 to fix broken SDK build.]

The main makefile+scripts to build the Windows SDK is still
in development/build/tools. However it defers to a new
matching set of files here in sdk/build to build and
package things that depend on the sdk.git or external/qemu.git.

This will make it easier for us to prepare SDKs based on
a tools_rN branch that isn't cut at the same time than the
platform branch.

This is a multi-part changeset. The other part is in
development.git.

Change-Id: I8072bf59ee1af57826a8bafa0103afd6fe3fc858

13 years agoADT: rework extract string refactoring.
Raphael Moll [Sat, 27 Nov 2010 05:56:50 +0000 (21:56 -0800)]
ADT: rework extract string refactoring.

This updates the code that inserts new <string> elements
in a <resources> XML, replacing my micro-XML stream-oriented
parser by one based on the WST SSE region model.

Also added a mini doc to explain the WST region model, since
there's no doc anywhere as far as I can see. I choose to place
this ad-hoc doc where I need it rather than in a generic place
-- it's not a generic doc, more a reminder of the API.

Change-Id: Icd39390c4124ce0ec21322ff223390ac4a06f431

13 years agoMerge "ADT: Animation preparation."
Xavier Ducrohet [Mon, 29 Nov 2010 19:56:38 +0000 (11:56 -0800)]
Merge "ADT: Animation preparation."

13 years agoADT: Animation preparation.
Xavier Ducrohet [Thu, 25 Nov 2010 00:41:53 +0000 (16:41 -0800)]
ADT: Animation preparation.

Update layoutlib API to work better with the new scene
locking mechanism (for concurrent renderings), new error
types in SceneResult, and updated Animation listener.

ADT changes to record the view object in CanvasViewInfo,
and the current LayoutScene in ViewHierarchy.

Added a test menu item to start an animation. This
is temporary and will be fixed later.

Change-Id: I67df2d116afdfd23c093e4645d4a0f99695c5d95

13 years agoMerge "Extract layout constants into a separate constants class"
Tor Norbye [Mon, 29 Nov 2010 17:31:38 +0000 (09:31 -0800)]
Merge "Extract layout constants into a separate constants class"

13 years agoMerge "Add unit test configuration for moreUnit"
Tor Norbye [Mon, 29 Nov 2010 15:01:13 +0000 (07:01 -0800)]
Merge "Add unit test configuration for moreUnit"

13 years agoExtract layout constants into a separate constants class
Tor Norbye [Wed, 24 Nov 2010 18:07:08 +0000 (10:07 -0800)]
Extract layout constants into a separate constants class

Combine the constants in BaseView and a LayoutConstants class over in
the internal packages into a new LayoutConstants class, and reference
these constants elsewhere (statically imported). This was suggested by
in the feedback to review #18971.

Change-Id: I40b76f8f6045c34a98f7a2363f96d2942360d1f3

13 years agoMerge "Fix build. Wrong import package!"
Tor Norbye [Mon, 29 Nov 2010 04:29:32 +0000 (20:29 -0800)]
Merge "Fix build. Wrong import package!"

13 years agoFix build. Wrong import package!
Tor Norbye [Mon, 29 Nov 2010 04:25:50 +0000 (20:25 -0800)]
Fix build. Wrong import package!

Fix build. Wrong import package!

Change-Id: Id96450a7f5553c88d0d5c0996ff5c378ea03bbc3

13 years agoMerge "Show images during canvas drags"
Tor Norbye [Mon, 29 Nov 2010 03:35:08 +0000 (19:35 -0800)]
Merge "Show images during canvas drags"

13 years agoShow images during canvas drags
Tor Norbye [Fri, 19 Nov 2010 19:29:34 +0000 (11:29 -0800)]
Show images during canvas drags

When you drag in the canvas, show a drag image for the view being
dragged. The drag image is using 30% translucency such that it does
not obscure the drag feedback below it.

We're grabbing the image data right out of the rendered scene and just
copying out the rectangles for the bounds of each selected item. This
has to take the canvas zoom into effect too.

While in the zoom code I modified the Zoom In and Zoom Out buttons to
only zoom by a factor of 20% rather than 100%.

I cleaned up the Pair class slightly; in an earlier version of this
fix I was using it to pass back two results from the rectangle
painting function; I don't do that anymore but the Pair might as well
be cleaned up.

(By the way, as suggested in review #19035 I rewrote the FIXME comment
related to resource lookup and put it in this CL rather than revising
the other one.)

Change-Id: Iabe6e29c4073252f5046e3c26b56f4e7674a3f3a

13 years agoADT: cleanup RenamePackage action.
Raphael Moll [Sat, 27 Nov 2010 06:43:40 +0000 (22:43 -0800)]
ADT: cleanup RenamePackage action.

Move it to the refactoring package.
Split action code from refactoring code.
No change in functionality nor invocation (via
context menu project > Android Tools.)

Change-Id: Ieec945b37fdd33d497bf745d207eb5d6b5445d9f

13 years agoMerge "Unit test fixes"
Tor Norbye [Wed, 24 Nov 2010 22:13:26 +0000 (14:13 -0800)]
Merge "Unit test fixes"

13 years agoUnit test fixes
Tor Norbye [Wed, 24 Nov 2010 17:27:54 +0000 (09:27 -0800)]
Unit test fixes

First, the AddonsListFetcherTest#testLoadSample_1 was failing on the
Mac, because the source code contained non-ASCII unicode characters,
and the encoding differs between Windows, Linux and Mac -- and on the
Mac the characters were garbage (not the intended Japanese
characters). Fixed by using unicode escape sequences to define the
expected output instead.

Second, rename the AbstractLayoutTest to LayoutTestBase; the test
runner (for plugins, not unit tests) was assuming this was a test case
(even though it's an abstract class!) so it was emitting a warning
about the class containing no test cases. This is simply a base class
for all the individual layout tests defining a bunch of useful
inherited shared behavior, so rename to avoid the warning.

Change-Id: I6e29316c5644db35051218aef8b99ac41ab0cda4

13 years agoAdd unit test configuration for moreUnit
Tor Norbye [Wed, 24 Nov 2010 16:25:53 +0000 (08:25 -0800)]
Add unit test configuration for moreUnit

Eclipse doesn't have a builtin mechanism to jump between a class and
its test, as well as a way to run tests associated with a given
class. There is however a plugin for this, "moreUnit".

Our projects have split off our unit tests in a separate project,
which requires some per-project configuration to tell moreUnit where
to look for tests. This information has to live with the project
rather than in my workspace, so I'm checking in the configuration file
- it is harmless if you don't have moreUnit but useful if you do.

Change-Id: Id29c46e2eaa89f2ad530c2b24700db28cc823b3b

13 years agoMerge "Replace IPath.makeRelativeTo call with reflection"
Tor Norbye [Wed, 24 Nov 2010 04:54:50 +0000 (20:54 -0800)]
Merge "Replace IPath.makeRelativeTo call with reflection"

13 years agoReplace IPath.makeRelativeTo call with reflection
Tor Norbye [Wed, 24 Nov 2010 04:50:33 +0000 (20:50 -0800)]
Replace IPath.makeRelativeTo call with reflection

I broke the build because on Eclipse 3.4 there is no makeRelativeTo
method on IPath. This replaces that call with reflection. This won't
work on 3.4, but it's a quick fix for the broken build.

Change-Id: Ia917cf5a745f76bbb96f59fae93e2a4fc4f5f900

13 years agoMerge "Open included layout on double click"
Tor Norbye [Wed, 24 Nov 2010 01:21:40 +0000 (17:21 -0800)]
Merge "Open included layout on double click"

13 years agoMerge "Fix nine patch size."
Xavier Ducrohet [Wed, 24 Nov 2010 00:06:41 +0000 (16:06 -0800)]
Merge "Fix nine patch size."

13 years agoMerge "Remove some asserts."
Raphael Moll [Wed, 24 Nov 2010 00:02:36 +0000 (16:02 -0800)]
Merge "Remove some asserts."

13 years agoOpen included layout on double click
Tor Norbye [Mon, 22 Nov 2010 05:37:20 +0000 (21:37 -0800)]
Open included layout on double click

On double click, if the clicked area originates from an <include>'ed
XML file, open the included layout in the editor. Also opens
files in the @android: namespace if available, for example if you
inculde @android:layout/select_dialog_multichoice.

Change-Id: I215c411257717f7b97e7b0ee1d5498c318cdb04d

13 years agoRemove some asserts.
Raphael Moll [Tue, 23 Nov 2010 23:23:49 +0000 (15:23 -0800)]
Remove some asserts.

Change-Id: I8458dc9237506c542c766e6119261ae4e13b453b

13 years agoMerge "ADT: ensure <application> is last in manifest."
Raphael Moll [Tue, 23 Nov 2010 22:57:35 +0000 (14:57 -0800)]
Merge "ADT: ensure <application> is last in manifest."

13 years agoADT: ensure <application> is last in manifest.
Raphael Moll [Tue, 23 Nov 2010 02:46:40 +0000 (18:46 -0800)]
ADT: ensure <application> is last in manifest.

ADT descriptors have no notion of XML ordering.
We modify the concept of "mandatory" descriptor to
have normal mandatory descriptors versus "mandatory last" ones.
("mandatory" elements are virtual reserved slots that are
 always present in the UiModel even if they have no real
 counterpart in the XML model. These elements ensure they can
 be manipulated in the UI even before their XML is created.)

Then we try our best to ensure the "last" ones remain at the
end of the UiNode model. There are 2 cases:
- in UiElementNode, when constructing the UINode model when
  parsing an existing XML model, we try to reorder the nodes
  at the end if possible.
- in UiActions, when adding a new element to the UiModel, we
  try to place it before the first "mandatory last" element.

SDK Bug 3197310

Change-Id: I6a7d9502a95ebe92ff82e07f3f3249a0d25c2154

13 years agoFix nine patch size.
Xavier Ducrohet [Tue, 23 Nov 2010 22:40:47 +0000 (14:40 -0800)]
Fix nine patch size.

Since we moved the 9-patch chunk out of the NinePatch, the image
content portion is not in our control (it's owned by the default
implementation of NinePatchDrawable through an Android Bitmap),
and therefore should not include the control outer line.

This changeset makes the bitmap contains only the extracted
content and makes the computation of the patches take into account that
the draw method will be applied on a bitmap that is only
the content without the control line.
Basically the computation of the patches/fixed rectangle exclude the
outer control line.

Change-Id: I29c2224ee2311962b30d1fb155b85d5731d4e6ec

13 years agoMerge "Refactor selection painting to fix highlighting of included views"
Tor Norbye [Tue, 23 Nov 2010 22:00:31 +0000 (14:00 -0800)]
Merge "Refactor selection painting to fix highlighting of included views"

13 years agoMerge "Move the ninepatch info into its own class."
Xavier Ducrohet [Tue, 23 Nov 2010 18:59:47 +0000 (10:59 -0800)]
Merge "Move the ninepatch info into its own class."

13 years agoMerge "Fix live manipulation of <include> elements"
Tor Norbye [Tue, 23 Nov 2010 18:27:45 +0000 (10:27 -0800)]
Merge "Fix live manipulation of <include> elements"

13 years agoMerge "Fix unit test log usage"
Tor Norbye [Tue, 23 Nov 2010 18:26:17 +0000 (10:26 -0800)]
Merge "Fix unit test log usage"

13 years agoMerge "Fix -v logging level flag."
Bill Napier [Tue, 23 Nov 2010 18:08:46 +0000 (10:08 -0800)]
Merge "Fix -v logging level flag."

13 years agoFix -v logging level flag.
Bill Napier [Mon, 22 Nov 2010 22:04:22 +0000 (14:04 -0800)]
Fix -v logging level flag.

- Rather than ignoring the flag, actually make use of it.
- Change the default logging level to SEVERE
- Change the "command slow" exception print from ddmlib to INFO

Change-Id: Iade4700b32ed7b4a55bcd3336c74b2127693bebe

13 years agoMerge "Fix URL for eclipse download (for auto build plugin)"
Raphael Moll [Tue, 23 Nov 2010 09:20:35 +0000 (01:20 -0800)]
Merge "Fix URL for eclipse download (for auto build plugin)"

13 years agoFix URL for eclipse download (for auto build plugin)
Raphael Moll [Tue, 23 Nov 2010 09:18:20 +0000 (01:18 -0800)]
Fix URL for eclipse download (for auto build plugin)

Change-Id: I1eba4b240869a222a0eb1c8676cd120acfb0fba4

13 years agoMerge "Fix potential NPE when closing Eclipse/ADT"
Raphael Moll [Tue, 23 Nov 2010 05:28:52 +0000 (21:28 -0800)]
Merge "Fix potential NPE when closing Eclipse/ADT"

13 years agoFix potential NPE when closing Eclipse/ADT
Raphael Moll [Tue, 23 Nov 2010 02:43:43 +0000 (18:43 -0800)]
Fix potential NPE when closing Eclipse/ADT

Seems like it was trying to finish a build and closing
the plugin ADT at the same time. How's that even possible?
In any case I've never seen that before and I was in
debug mode, so I bet it's a rare race condition.

SDK Bug 3222178

Change-Id: I28a9bdfcbe56e2a6b73eafb5cadea611c5177f7f

13 years agoMove the ninepatch info into its own class.
Xavier Ducrohet [Tue, 23 Nov 2010 04:07:12 +0000 (20:07 -0800)]
Move the ninepatch info into its own class.

The chunk is what is used separately by the default NinePatch class,
through serialization to make a byte[] out of it.

Since we are moving away from replacement classes to delegate, splitting
the chunk info away from the image allows us to use the normal
NinePatch(Drawable).

Change-Id: Ifd86dc2aa9b485d0e97a2d4a248621cfcddda9ab

13 years agoFix unit test log usage
Tor Norbye [Mon, 22 Nov 2010 22:54:37 +0000 (14:54 -0800)]
Fix unit test log usage

There were some test failures because unit tests were relying on
AdtPlugin's logger, which appears to be null during unit test
runs. Use a new test logger instead, which fails the current test if
anyone logs an error message, and dumps warnings to standard error and
prints to standard output.

Change-Id: I8e52fed554d49e98f7d6c8990d41831998f44640