OSDN Git Service
The Android Open Source Project [Thu, 2 Dec 2010 20:15:01 +0000 (12:15 -0800)]
merge from open-source master
Change-Id: Ie58d7fa7c8969e6230ae573d8550175fe8de786f
Xavier Ducrohet [Thu, 2 Dec 2010 20:10:02 +0000 (12:10 -0800)]
Merge "LayoutLib 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
The Android Open Source Project [Thu, 2 Dec 2010 18:30:45 +0000 (10:30 -0800)]
merge from open-source master
Change-Id: I75f1967441d6facd65a16ad22b7b0e2d80ea4857
Xavier Ducrohet [Thu, 2 Dec 2010 18:22:53 +0000 (10:22 -0800)]
Merge "Fix 9-patch padding"
Xavier Ducrohet [Thu, 2 Dec 2010 18:22:34 +0000 (10:22 -0800)]
Merge "LayoutLib API: New SceneStatus enum."
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
Xavier Ducrohet [Thu, 2 Dec 2010 02:25:36 +0000 (18:25 -0800)]
LayoutLib API: New SceneStatus enum.
Change-Id: I1c2ac6ddcabe1faeffe3753735b9f87fde683fd3
The Android Open Source Project [Thu, 2 Dec 2010 00:06:47 +0000 (16:06 -0800)]
merge from open-source master
Change-Id: Ifea6128a9dc6899797611782e79f549ee8b0edd7
Xavier Ducrohet [Thu, 2 Dec 2010 00:00:52 +0000 (16:00 -0800)]
Merge "Layoutlib 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
The Android Open Source Project [Wed, 1 Dec 2010 18:52:47 +0000 (10:52 -0800)]
merge from open-source master
Change-Id: I9c840239fae5a0a90da58b9dc1a1d158aed2c601
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"
The Android Open Source Project [Wed, 1 Dec 2010 04:17:29 +0000 (20:17 -0800)]
merge from open-source master
Change-Id: I9a3685de13e5b1c4e03cd2d82f879cd7f1ca8135
Raphael Moll [Wed, 1 Dec 2010 04:07:08 +0000 (20:07 -0800)]
Merge "ADT: fix java/class name mismatch."
The Android Open Source Project [Wed, 1 Dec 2010 04:06:05 +0000 (20:06 -0800)]
merge from open-source master
Change-Id: I93e66eb9c9a468d756b1cbcdf100eb0676897f06
Raphael Moll [Wed, 1 Dec 2010 03:55:19 +0000 (19:55 -0800)]
Merge "ADT: cleanup RenamePackage action."
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
The Android Open Source Project [Tue, 30 Nov 2010 23:04:59 +0000 (15:04 -0800)]
merge from open-source master
Change-Id: Ife0027c5b18435f5188202f801ef49e31cd5c01a
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."
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
Raphael Moll [Tue, 30 Nov 2010 22:43:55 +0000 (14:43 -0800)]
ADT: fix java/class name mismatch.
Change-Id: Id0e539be1873904245f50b3bcd861f171360a990
The Android Open Source Project [Tue, 30 Nov 2010 20:21:41 +0000 (12:21 -0800)]
merge from open-source master
Change-Id: Ie021e68a089f09caf7fafc54fee5daa06fd271f5
Raphael Moll [Tue, 30 Nov 2010 20:15:04 +0000 (12:15 -0800)]
Merge "Move 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
Raphael Moll [Tue, 30 Nov 2010 20:14:10 +0000 (12:14 -0800)]
Merge "ADT 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
The Android Open Source Project [Tue, 30 Nov 2010 20:02:05 +0000 (12:02 -0800)]
merge from open-source master
Change-Id: I56b879de8f41047eb52e7fcefd1a46119c7cbc2e
Tor Norbye [Tue, 30 Nov 2010 19:37:08 +0000 (11:37 -0800)]
Merge "Replace 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
Tor Norbye [Tue, 30 Nov 2010 18:52:33 +0000 (10:52 -0800)]
Merge "The 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
The Android Open Source Project [Tue, 30 Nov 2010 02:10:13 +0000 (18:10 -0800)]
merge from open-source master
Change-Id: Ib8ef5125a7206364770f9b28a5923843ed7898a5
Xavier Ducrohet [Tue, 30 Nov 2010 01:57:25 +0000 (17:57 -0800)]
Merge "ADT: more animation stuff."
Xavier Ducrohet [Mon, 29 Nov 2010 19:45:47 +0000 (11:45 -0800)]
ADT: more animation stuff.
Change-Id: I020342a4fe205161328f22e9dabb0b03343677b5
The Android Open Source Project [Tue, 30 Nov 2010 01:19:19 +0000 (17:19 -0800)]
merge from open-source master
Change-Id: Ifda9d2cdfeb44b85ed5ad1737cfca1fc42415101
Tor Norbye [Tue, 30 Nov 2010 01:07:24 +0000 (17:07 -0800)]
Merge "Rename 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
The Android Open Source Project [Mon, 29 Nov 2010 23:31:50 +0000 (15:31 -0800)]
merge from open-source master
Change-Id: I5ac19298cc7a959c840258299d1179f3f06146ce
Raphael Moll [Mon, 29 Nov 2010 23:23:39 +0000 (15:23 -0800)]
Merge "ADT: rework extract string refactoring."
The Android Open Source Project [Mon, 29 Nov 2010 23:19:12 +0000 (15:19 -0800)]
merge from tools_r8
Change-Id: I7553de468542889488ac4dba53a23ae876ff5526
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
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
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
The Android Open Source Project [Mon, 29 Nov 2010 20:04:37 +0000 (12:04 -0800)]
merge from open-source master
Change-Id: I611ccb2c4016db79dcfc6dcede7938706a7a4e82
Xavier Ducrohet [Mon, 29 Nov 2010 19:56:38 +0000 (11:56 -0800)]
Merge "ADT: 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
The Android Open Source Project [Mon, 29 Nov 2010 17:42:30 +0000 (09:42 -0800)]
merge from open-source master
Change-Id: I247411eb40714c4500dd79b175b7b7caecbfb757
Tor Norbye [Mon, 29 Nov 2010 17:31:38 +0000 (09:31 -0800)]
Merge "Extract layout constants into a separate constants class"
The Android Open Source Project [Mon, 29 Nov 2010 15:10:10 +0000 (07:10 -0800)]
merge from open-source master
Change-Id: I7e8cece37a2acab21ba85d0370b1aef118fcf23c
Tor Norbye [Mon, 29 Nov 2010 15:01:13 +0000 (07:01 -0800)]
Merge "Add unit test configuration for moreUnit"
The Android Open Source Project [Mon, 29 Nov 2010 04:38:15 +0000 (20:38 -0800)]
merge from open-source master
Change-Id: I345430ffb276222c850a15bbab59438a717de091
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
Tor Norbye [Mon, 29 Nov 2010 04:29:32 +0000 (20:29 -0800)]
Merge "Fix 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
The Android Open Source Project [Mon, 29 Nov 2010 03:41:51 +0000 (19:41 -0800)]
merge from open-source master
Change-Id: Iac4c66859768cc745b274985a19accb6273e9320
Tor Norbye [Mon, 29 Nov 2010 03:35:08 +0000 (19:35 -0800)]
Merge "Show 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
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
The Android Open Source Project [Wed, 24 Nov 2010 22:25:25 +0000 (14:25 -0800)]
merge from open-source master
Change-Id: I0745cd709b0a481f12c29cf8858b51134a1265d7
Tor Norbye [Wed, 24 Nov 2010 22:13:26 +0000 (14:13 -0800)]
Merge "Unit 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
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
The Android Open Source Project [Wed, 24 Nov 2010 04:57:09 +0000 (20:57 -0800)]
merge from open-source master
Change-Id: I66a3b8c183bee0f8efc86f53a7dfd9004ed75867
Tor Norbye [Wed, 24 Nov 2010 04:54:50 +0000 (20:54 -0800)]
Merge "Replace 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
The Android Open Source Project [Wed, 24 Nov 2010 01:23:15 +0000 (17:23 -0800)]
merge from open-source master
Change-Id: I0a6441de70a779781b68c12433b2390e600c5d2e
Tor Norbye [Wed, 24 Nov 2010 01:21:40 +0000 (17:21 -0800)]
Merge "Open included layout on double click"
The Android Open Source Project [Wed, 24 Nov 2010 00:11:18 +0000 (16:11 -0800)]
merge from open-source master
Change-Id: If98e561ae25793be21b97ef3f16cf0f6f854d6f4
Xavier Ducrohet [Wed, 24 Nov 2010 00:06:41 +0000 (16:06 -0800)]
Merge "Fix nine patch size."
Raphael Moll [Wed, 24 Nov 2010 00:02:36 +0000 (16:02 -0800)]
Merge "Remove some asserts."
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
Raphael Moll [Tue, 23 Nov 2010 23:23:49 +0000 (15:23 -0800)]
Remove some asserts.
Change-Id: I8458dc9237506c542c766e6119261ae4e13b453b
The Android Open Source Project [Tue, 23 Nov 2010 22:59:05 +0000 (14:59 -0800)]
merge from open-source master
Change-Id: I559b431e4b45fd51fe5cd230e2b8206469cbf4ca
Raphael Moll [Tue, 23 Nov 2010 22:57:35 +0000 (14:57 -0800)]
Merge "ADT: 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
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
The Android Open Source Project [Tue, 23 Nov 2010 22:10:42 +0000 (14:10 -0800)]
merge from open-source master
Change-Id: I4b261c8bc0635174fb125ee68590b6b9f4c7b5db
Tor Norbye [Tue, 23 Nov 2010 22:00:31 +0000 (14:00 -0800)]
Merge "Refactor selection painting to fix highlighting of included views"
The Android Open Source Project [Tue, 23 Nov 2010 19:13:02 +0000 (11:13 -0800)]
merge from open-source master
Change-Id: Ia341d955de13d0c1e7dca0a55173345b11cac745
Xavier Ducrohet [Tue, 23 Nov 2010 18:59:47 +0000 (10:59 -0800)]
Merge "Move the ninepatch info into its own class."
The Android Open Source Project [Tue, 23 Nov 2010 18:35:25 +0000 (10:35 -0800)]
merge from open-source master
Change-Id: If699b3e30843890c08e9f5a31fb5c1305cc6ae9e
Tor Norbye [Tue, 23 Nov 2010 18:27:45 +0000 (10:27 -0800)]
Merge "Fix live manipulation of <include> elements"
Tor Norbye [Tue, 23 Nov 2010 18:26:17 +0000 (10:26 -0800)]
Merge "Fix unit test log usage"
The Android Open Source Project [Tue, 23 Nov 2010 18:11:34 +0000 (10:11 -0800)]
merge from open-source master
Change-Id: I5cf9142f6fa6b876fcdc01446dda8c8d98fed25c
Bill Napier [Tue, 23 Nov 2010 18:08:46 +0000 (10:08 -0800)]
Merge "Fix -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
The Android Open Source Project [Tue, 23 Nov 2010 09:30:18 +0000 (01:30 -0800)]
merge from open-source master
Change-Id: I944fbeab95d750bf30c224c526027534e2b7d611
Raphael Moll [Tue, 23 Nov 2010 09:20:35 +0000 (01:20 -0800)]
Merge "Fix 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
The Android Open Source Project [Tue, 23 Nov 2010 05:38:13 +0000 (21:38 -0800)]
merge from open-source master
Change-Id: Ied18408d470e506c4107941980994d3f1a1ce013
Raphael Moll [Tue, 23 Nov 2010 05:28:52 +0000 (21:28 -0800)]
Merge "Fix 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
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
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
Tor Norbye [Mon, 22 Nov 2010 17:58:06 +0000 (09:58 -0800)]
Fix live manipulation of <include> elements
This changeset fixes bugs related to dragging included views around in
the canvas:
First, the <include> tag would get rewritten to <null>. This happened
because the layout editor treats the FQCN and the XML node name as
equivalent, but in the case of the include tag the FQCN was set to
null instead of "include".
Second, the "layout" attribute would not get copied because it is NOT
in the Android namespace, and the code to copy attributes ended up
with an empty-string namespace which was not handled correctly.
Third, when copied the "layout" attribute would end up with the
namespace "ns:" because the code to create attribute nodes always
created namespaced attribute nodes rather than a plain attribute node
when the namespace is null.
Change-Id: Ibd34212517615aa8ec79abe14bca765cdca525f6
Tor Norbye [Sat, 20 Nov 2010 02:45:57 +0000 (18:45 -0800)]
Refactor selection painting to fix highlighting of included views
This changeset moves the painting of selection bounds and selection
hints out of the view rules and into the core IDE. The reason for this
is that the visual appearance of the selection shouldn't be up to each
rule; for one thing the selection highlight should be consistent and
not vary from view to view (and in fact there was only a single
implementation of the paint selection method among the view rules),
and for another the view rules are in theory sharable among IDEs
whereas the selection appearance is going to be IDE specific. There
was also painting of "hints" in the RelativeLayout; rather than having
the visual appearance of this dictated by the rule, this is also moved
into the IDE such that the rules only provide the hint text and the
hints are displayed by the IDE itself.
The above refactoring also fixes selection feedback for <include>'ed
views, which were not visually selectable because there was no
corresponding ViewRule, so nobody to paint selection. With these
changes selection painting is now independent of the rules.
Change-Id: I22dd926102128634a443b8bafb54d4764f1eda41
The Android Open Source Project [Sat, 20 Nov 2010 04:43:37 +0000 (20:43 -0800)]
merge from open-source master
Change-Id: I9233097052d1559e620c54a6450eb59e5f6d70e1
Raphael Moll [Sat, 20 Nov 2010 04:34:42 +0000 (20:34 -0800)]
Merge "Fix the other SwtUtilsTest methods under Windows."
Raphael Moll [Sat, 20 Nov 2010 02:44:43 +0000 (18:44 -0800)]
Fix the other SwtUtilsTest methods under Windows.
Fixes the following issues:
- All methods must use the palette mask to compare RGB values.
- Use a non-trivial default color for testing. The previous
choice of 0xFF00FF00 would not allow detecting RGB <-> BGR
mixups and the 0xFF alpha mask prevented from noticing the
fill operation was pre-multiplying the colors.
- Assert the converted image as the expected transparency type.
Change-Id: I1dc7518a7d7000bce75e1c4166a9921ba40a43cb