OSDN Git Service
The Android Open Source Project [Sat, 6 Nov 2010 01:14:03 +0000 (18:14 -0700)]
merge from open-source master
Change-Id: I82e33d808bac10d4f63b5379ee9367091865fde3
Tor Norbye [Sat, 6 Nov 2010 01:07:51 +0000 (18:07 -0700)]
Merge "Sort palette contents"
Tor Norbye [Fri, 5 Nov 2010 23:59:55 +0000 (16:59 -0700)]
Sort palette contents
The palette has many of the Android views in a seemingly random
order. This changeset ensures that they are ordered alphabetically.
Change-Id: I675265747e7835c933fe8e2c7f99dc3c64e6bfaf
The Android Open Source Project [Fri, 5 Nov 2010 20:59:49 +0000 (13:59 -0700)]
merge from open-source master
Change-Id: I6e2470258fa36fadb41b5de4aa0156f272f34ad0
Tor Norbye [Fri, 5 Nov 2010 20:54:47 +0000 (13:54 -0700)]
Merge "Mark internal strings as NON-NLS in rule classes"
The Android Open Source Project [Fri, 5 Nov 2010 16:54:25 +0000 (09:54 -0700)]
merge from open-source master
Change-Id: I83cf28d9bdef00e1f1ac5b1663e2faeeba0930ea
Tor Norbye [Fri, 5 Nov 2010 00:20:24 +0000 (17:20 -0700)]
Mark internal strings as NON-NLS in rule classes
Mark internal strings as NON-NLS in rule classes. This code was
initially written in Groovy which is why it didn't have NON-NLS
markers.
Change-Id: I74517771271e54f165332543092a9d29fc2bc52a
Tor Norbye [Fri, 5 Nov 2010 16:44:15 +0000 (09:44 -0700)]
Merge "Remove deprecated UiElementNode "editData" property"
Tor Norbye [Fri, 5 Nov 2010 16:43:20 +0000 (09:43 -0700)]
Merge "Add gesture support, marquee selection, and refactoring"
Tor Norbye [Fri, 5 Nov 2010 00:56:13 +0000 (17:56 -0700)]
Remove deprecated UiElementNode "editData" property
As requested in another review (#18753) the editData property on
UiElementNodes is obsolete (it was used by GLE1) and should be
removed. While there I also updated the naming style of local vars in
that class from underline to camelcase.
Change-Id: Ic5c50d07abedb1177cd018c866901f1e54cd0ec5
The Android Open Source Project [Fri, 5 Nov 2010 00:31:00 +0000 (17:31 -0700)]
merge from open-source master
Change-Id: I22daa7f51698f7a4f873f7c52a10845e2cd9f097
Tor Norbye [Fri, 5 Nov 2010 00:28:45 +0000 (17:28 -0700)]
Merge "Fix XML editing whitespace handling"
Tor Norbye [Tue, 26 Oct 2010 15:54:15 +0000 (08:54 -0700)]
Add gesture support, marquee selection, and refactoring
This checkin adds support for gestures and overlays. Gestures are
sessions of mouse/keyboard activity, and this is documented in the
javadoc for the new Gesture class. Overlays are units of graphics, and
these are documented in the Overlay javadoc. The gesture architecture
lets us isolate the logic for each different type of operation
(marquee, resize, move, etC), and with associated overlays we don't
attempt to for example paint drag feedback during a resize operation,
etc.
The checkin also adds marquee selection (as a second gesture, in
addition to the existing drag & drop based move gesture), along with
some associated changes in how the root view is treated.
As part of isolating the mouse handling and painting related to
gestures, painting etc., I also refactored the code quite a bit.
LayoutCanvas which used to be a large class has been split into a
number of new classes, one for each area of responsibility:
- The mouse listener and drag & drop code has been moved into a
GestureManager. (A lot of the drop handling code also came from the
CanvasDropListener class.)
- Code related to maintaining the set of rendered views, and
performing searches in the views, has been moved into a
ViewHierarchy class.
- Code related to selection has been moved into a SelectionManager.
- Various individual painting pieces (outline, hover, etc) have been
moved into individual Overlay classes such as OutlineOverlay,
HoverOverlay, SelectionOverlay, etc. This also moved associated
resource allocation and cleanup into the overlays.
- New coordinate classes, ControlPoint and LayoutPoint, are used
instead of ints and plain Points to make it really clear which
methods require coordinates in the layout (such as the
ViewHieararchy search methods) and which ones require coordinates in
the canvas control (such as paint methods). There are factory methods
to automatically construct the right kind of coordinate from
different types of mouse events, as well as methods to convert
between the two.
I also tweaked the visual appearance of selection a bit more, and
some other misc cleanup.
Change-Id: I666aabdcd36720bebe406b68237e8966d985fb8f
The Android Open Source Project [Thu, 4 Nov 2010 20:08:38 +0000 (13:08 -0700)]
merge from open-source master
Change-Id: Id333af467c0ba37653e1637ec729c8e6a722a721
The Android Open Source Project [Thu, 4 Nov 2010 19:56:07 +0000 (12:56 -0700)]
merge from tools_r8
Change-Id: I7bc7385266c44927db9dc66eed3b06e92eaf99e1
Raphael Moll [Thu, 4 Nov 2010 19:51:44 +0000 (12:51 -0700)]
Merge "SDK Repo Schema: <vendor> for <extra> elements." into tools_r8
Tor Norbye [Thu, 4 Nov 2010 03:16:09 +0000 (20:16 -0700)]
Fix XML editing whitespace handling
This changeset fixes three problems related to the way whitespace is
handled by the visual editor.
(1) The editor would insert a newline text node after a newly inserted
element, but this element was appended rather than inserted
immediately after the element, which meant that if you inserted your
element anywhere in the *middle* of the child list, you would
accumulate blank lines at the end of the parent's element and have no
separator before the current element.
The fix is simple - use insertBefore() rather than appendChild() when
inserting the new node.
(2) On deletion, no XML text nodes were deleted. This means that if
you inserted 4 elements, then deleted them, you would end up with 4
blank text nodes.
The fix here is to look at the sibling when we are about to delete,
and if it looks like a pure whitespace node, remove it as well.
(3) When nested content (like a LinearLayout) was inserted, there
would be no newline inserted before the child, so that first element
would end up on the same line as the parent.
The fix here is to detect this scenario (when we are inserting an
element into an element that has no children) and insert a newline
*before* the element (as well as after, as is the case for all newly
inserted elements).
Longer term we should do more advanced things with formatting, such as
indenting nested content, and making sure that when we insert and
remove whitespace nodes we always adjust the indentation
correctly. But for now, this changeset makes the XML generated by the
editor much more readable and consistent.
Change-Id: I2e65152568092a775074a606e3f5e54c680611c6
Raphael Moll [Wed, 3 Nov 2010 21:12:47 +0000 (14:12 -0700)]
SDK Repo Schema: <vendor> for <extra> elements.
Change-Id: I8fa13d28b787e3ecb8bd96896e6410313e2a66a9
The Android Open Source Project [Sat, 30 Oct 2010 00:23:44 +0000 (17:23 -0700)]
merge from open-source master
Change-Id: I59da9844f561bca215c90306f3942ad070d0a6d0
The Android Open Source Project [Sat, 30 Oct 2010 00:10:10 +0000 (17:10 -0700)]
merge from tools_r8
Change-Id: If932f5db0eb1d3b8caf49a2f18bc94b84eab9e3f
Raphael Moll [Sat, 30 Oct 2010 00:03:27 +0000 (17:03 -0700)]
Merge "SDK Manager: fix suggestions of new platforms." into tools_r8
Raphael Moll [Thu, 28 Oct 2010 23:41:49 +0000 (16:41 -0700)]
SDK Manager: fix suggestions of new platforms.
I accidentally broke the way the SDK Manager was suggesting
new platforms when I "optimized" the way it was fetching new
sources when resolving dependencies. The fix is that even if
we don't need to refresh or fetch a source, we still need to
report the packages we know it contains.
Also made the Archive and ArchiveInfo implement Comparable
and defer their comparison to the one of Package. This way
we can sort the archives in the install window.
Change-Id: Ic3b39e49e8143541b19b00de09468c1b3f01b0d7
The Android Open Source Project [Thu, 28 Oct 2010 00:56:17 +0000 (17:56 -0700)]
merge from open-source master
Change-Id: Idbf7fa0ee3390b06640fa39dbda3bca91ea327c8
The Android Open Source Project [Thu, 28 Oct 2010 00:44:31 +0000 (17:44 -0700)]
merge from tools_r8
Change-Id: I90eeb2def2e3d3f0ee6f34b0a3f710f966808a7a
The Android Open Source Project [Thu, 28 Oct 2010 00:44:27 +0000 (17:44 -0700)]
merge from open-source master
Change-Id: Ie76e2a7bea32a70200435222ed8f0f352ade0a4d
Raphael Moll [Thu, 28 Oct 2010 00:36:59 +0000 (17:36 -0700)]
Merge "ADT: support synthetic parent chains in attrs_manifest.xml" into tools_r8
Tor Norbye [Thu, 28 Oct 2010 00:36:59 +0000 (17:36 -0700)]
Merge "Select element surrounding caret when switching from editor"
The Android Open Source Project [Wed, 27 Oct 2010 23:57:13 +0000 (16:57 -0700)]
merge from open-source master
Change-Id: I8115fa4f83035d6a5aa59bcb0a5603f38f99a59b
The Android Open Source Project [Wed, 27 Oct 2010 23:45:46 +0000 (16:45 -0700)]
merge from tools_r8
Change-Id: I8792be345899be48cbe7c22f386f09fd4aa13691
Xavier Ducrohet [Wed, 27 Oct 2010 23:44:12 +0000 (16:44 -0700)]
Merge "Fix adb location in ant rules." into tools_r8
The Android Open Source Project [Wed, 27 Oct 2010 23:21:39 +0000 (16:21 -0700)]
merge from open-source master
Change-Id: I0f5fd397bacd6c7f02632666f662514d0dc2b452
Tor Norbye [Wed, 27 Oct 2010 22:35:27 +0000 (15:35 -0700)]
Select element surrounding caret when switching from editor
If you edit the XML, and then switch back to the visual editor, this
changeset will cause the element surrounding the caret (if any) to be
selected in the visual editor.
Change-Id: I1f03856b3b3946fe23d6e654773ee4318d0d56ed
Tor Norbye [Wed, 27 Oct 2010 23:12:45 +0000 (16:12 -0700)]
Merge "Warp to source editor on widget double click"
Xavier Ducrohet [Wed, 27 Oct 2010 22:31:57 +0000 (15:31 -0700)]
Fix adb location in ant rules.
Change-Id: Ia8188de0b8af0ec4474f5c4ca2cec294c077e03f
The Android Open Source Project [Wed, 27 Oct 2010 22:45:00 +0000 (15:45 -0700)]
merge from open-source master
Change-Id: I230d32aa3dda68a359abb9620ee5ed638fc21bb9
The Android Open Source Project [Wed, 27 Oct 2010 22:33:26 +0000 (15:33 -0700)]
merge from tools_r8
Change-Id: Id7dbdfae280b98547f9a80e07cc5d80d7f9f92f7
The Android Open Source Project [Wed, 27 Oct 2010 22:33:22 +0000 (15:33 -0700)]
merge from open-source master
Change-Id: I5ab9aa36b3878afd357b6755771b9eb611670e90
Raphael Moll [Wed, 27 Oct 2010 22:28:02 +0000 (15:28 -0700)]
ADT: support synthetic parent chains in attrs_manifest.xml
SDK Bug:
3125910
Change-Id: I00450b13d10cbe4f32cbfbd6e1945985b599920f
The Android Open Source Project [Wed, 27 Oct 2010 22:21:54 +0000 (15:21 -0700)]
merge from tools_r8
Change-Id: I907004c9f3c55a7e454e0bca644fa4efe200f15b
Xavier Ducrohet [Wed, 27 Oct 2010 22:21:36 +0000 (15:21 -0700)]
Merge "Fix resource issues in ADT." into tools_r8
Raphael Moll [Wed, 27 Oct 2010 22:13:23 +0000 (15:13 -0700)]
Merge "ADT: Separate manifest test for AttrsXmlParser." into tools_r8
Raphael [Thu, 12 Aug 2010 02:33:42 +0000 (19:33 -0700)]
Fix resource issues in ADT.
Change-Id: I744833ec03d0d379ea526c193549f99f25f6811a
Tor Norbye [Wed, 27 Oct 2010 21:33:42 +0000 (14:33 -0700)]
Warp to source editor on widget double click
Update mouse handler such that a double click will look up the
corresponding XML element, front the XML source editor and select the
text range (scrolling if necessary) to reveal the corresponding tag.
Change-Id: Iaa3d6f845c3fea190c304a07fab07314baa3f638
The Android Open Source Project [Wed, 27 Oct 2010 20:25:43 +0000 (13:25 -0700)]
merge from open-source master
Change-Id: Ib5b569eb6ca195be8e5d16bbfe2face29d5708cd
Tor Norbye [Wed, 27 Oct 2010 20:23:47 +0000 (13:23 -0700)]
Merge "Add dictionary to codebase"
Raphael Moll [Mon, 25 Oct 2010 19:37:31 +0000 (12:37 -0700)]
ADT: Separate manifest test for AttrsXmlParser.
Change-Id: I8ea1a31fd7db849fffb9043c58a91f82444d98d4
The Android Open Source Project [Wed, 27 Oct 2010 17:34:37 +0000 (10:34 -0700)]
merge from open-source master
Change-Id: I2bac468cca9b72403577ad60ed134e4429b7e0d1
The Android Open Source Project [Wed, 27 Oct 2010 17:23:20 +0000 (10:23 -0700)]
merge from tools_r8
Change-Id: I2f8e8e1257fb51c2fda1617804fa6136526b426c
Tor Norbye [Wed, 27 Oct 2010 17:21:46 +0000 (10:21 -0700)]
Add dictionary to codebase
Eclipse has the ability to spellcheck comments, and it ships with an
English dictionary. However, many valid terms in our codebase is not
in this dictionary. This checkin adds a dictionary file which contains
many of the valid spelling words used in our codebase.
(Unfortunately, Eclipse does not support "project dictionaries" like
some other IDEs where individual user dictionaries are merged with
shared project dictionaries. However, this new dictionary should be
useful for developers who use a dedicated workspace for Android
development.)
This changeset also fixes some typos.
Change-Id: Ied6647f6cb550460c0087498f8c94fa6624e3b4e
Raphael Moll [Wed, 27 Oct 2010 17:13:51 +0000 (10:13 -0700)]
Merge "ADT: Fix display of unknown Manifest elements." into tools_r8
Raphael Moll [Wed, 27 Oct 2010 17:05:54 +0000 (10:05 -0700)]
ADT: Fix display of unknown Manifest elements.
SDK Bug:
3135772
Change-Id: I4f7c84c20b31e70db20a202f168158d500b3c09d
The Android Open Source Project [Wed, 27 Oct 2010 05:41:38 +0000 (22:41 -0700)]
merge from open-source master
Change-Id: I7ae9a93d77c470c97d0640bcfccddd81f463378c
The Android Open Source Project [Wed, 27 Oct 2010 05:30:24 +0000 (22:30 -0700)]
merge from tools_r8
Change-Id: I301171df40d831b03ba3563e72a3910dd6d6951e
Raphael Moll [Wed, 27 Oct 2010 05:20:16 +0000 (22:20 -0700)]
Merge "ADT: Exclude <include> tag from the GLE palette." into tools_r8
Raphael Moll [Tue, 26 Oct 2010 23:18:45 +0000 (16:18 -0700)]
ADT: Exclude <include> tag from the GLE palette.
Change-Id: Ia318556bc88a823fb6eae9048634c824524f3b90
The Android Open Source Project [Tue, 26 Oct 2010 18:42:22 +0000 (11:42 -0700)]
merge from open-source master
Change-Id: I51c83c375936259d6ebe3efabd77eb1f46805236
The Android Open Source Project [Tue, 26 Oct 2010 18:30:02 +0000 (11:30 -0700)]
merge from tools_r8
Change-Id: Ibdee0b6cb56b39ccfe1c604f8300f94c81320590
Raphael Moll [Tue, 26 Oct 2010 18:21:13 +0000 (11:21 -0700)]
Merge "SDK: Fixed proguard.bat & co." into tools_r8
Raphael Moll [Tue, 26 Oct 2010 18:21:07 +0000 (11:21 -0700)]
Merge "ADT: fixes to make Proguard work under Windows." into tools_r8
Raphael Moll [Mon, 25 Oct 2010 21:27:23 +0000 (14:27 -0700)]
SDK: Fixed proguard.bat & co.
These are similar to the external/proguard/bin/*.bat
except they use $SDK/tools/lib/find_java.bat to locate the
java location and use it if available. find_java will print
a proeminent error if java cannot be found.
Change-Id: I1fceae838436053031f405de9b3f1ab2d64222e6
Raphael Moll [Mon, 25 Oct 2010 20:28:07 +0000 (13:28 -0700)]
ADT: fixes to make Proguard work under Windows.
- the proguard.bat can only pass 9 args, but we have 15+, so
we'll use a temporary proguard config file for Windows.
- PROGUARD_HOME needs to be defined properly since the default
proguard.bat cannot infer it properly. We need other fixes
to that batch file so eventually we're not going to ship the
default one and we can fix the .bat file, but properly defining
this env var is probably a good idea anyway.
Change-Id: Id007d5504a5e05d1c4b5a0728e96e0d677978ef4
The Android Open Source Project [Tue, 26 Oct 2010 17:42:35 +0000 (10:42 -0700)]
merge from open-source master
Change-Id: Iafa3b62c5a5607bb7627543298113b1470a6fe51
Tor Norbye [Tue, 26 Oct 2010 17:33:11 +0000 (10:33 -0700)]
Merge "Support 3rd party layout rule loading, and rip out Groovy support"
Tor Norbye [Mon, 25 Oct 2010 21:00:04 +0000 (14:00 -0700)]
Support 3rd party layout rule loading, and rip out Groovy support
Add support for loading 3rd party .jars providing additional layout
rules. This can be configured by adding a property referencing the
jars to be loaded as part of your build.properties, like this:
default.properties:
...
layoutrules.jars=chart-rules.jar:graph-rules.jar
...
This will create a class loader referencing chart-rules.jar and
graph-rules.jar (as well as the visual editor's plugin class loader as
a fallback), and this class loader is used to load IViewRule
implementations.
In addition, this plugin rips out the various remaining Groovy hooks
and references that were earlier used to load Groovy scripts as layout
rules, and removes groovy from the load path and build symlinking
scripts.
Change-Id: Ia17a60259559ec86270726add258382a879117dc
The Android Open Source Project [Mon, 25 Oct 2010 22:45:22 +0000 (15:45 -0700)]
merge from open-source master
Change-Id: Ia61cea62f72a18aea3d908c90c90af9a517ed659
The Android Open Source Project [Mon, 25 Oct 2010 22:32:15 +0000 (15:32 -0700)]
merge from tools_r8
Change-Id: If3f0a5d9b487e23c8f28fc4db676b0cb70d09c5a
Xavier Ducrohet [Mon, 25 Oct 2010 22:20:52 +0000 (15:20 -0700)]
Merge "Fix external jar support when building with proguard." into tools_r8
Xavier Ducrohet [Mon, 25 Oct 2010 21:24:09 +0000 (14:24 -0700)]
Fix external jar support when building with proguard.
Change-Id: I3dafb284770f475d70a212cbe22cdae6bff36ff7
The Android Open Source Project [Mon, 25 Oct 2010 21:20:18 +0000 (14:20 -0700)]
merge from open-source master
Change-Id: I922e77a1fde90a6d73cc5f9afcf79f11343e18a2
Tor Norbye [Mon, 25 Oct 2010 21:12:17 +0000 (14:12 -0700)]
Merge "Add layout unit tests"
Tor Norbye [Mon, 25 Oct 2010 03:57:21 +0000 (20:57 -0700)]
Add layout unit tests
Add layout unit tests, and some infrastructure for testing. Also fix
some formatting errors (>100 column lines) in the previous commit.
Change-Id: I3eabf30998ab7deb84df57e4d0c10cf57ee399d5
The Android Open Source Project [Mon, 25 Oct 2010 02:26:29 +0000 (19:26 -0700)]
merge from open-source master
Change-Id: I4bb2ec08eab7d1d7340c02ee7619dc9db9531c11
Tor Norbye [Mon, 25 Oct 2010 02:21:07 +0000 (19:21 -0700)]
Merge "Port layout rules to Java"
Tor Norbye [Mon, 18 Oct 2010 21:24:27 +0000 (14:24 -0700)]
Port layout rules to Java
We had a number of layout implementations in the tool written in
Groovy; these were hard to deal with because of lack of good tool
support (debugging didn't work, refactoring didn't work, code
completion didn't (always) work, go to declaration didn't work,
semantic checks like unused code didn't work, etc. etc.)
Since these layout helpers are only getting larger, replace them by
equivalent Java code to make development easier.
This checkin also moves the API classes formerly used by Groovy
scripts into a new package (next to the Java layout rules) under
com.android.ide.common (api and layout) since this code isn't Eclipse
specific and could be used by other IDE vendors.
These interfaces were left identical (only the package statements and
directory location changed), with two exceptions: I added a new method
called "in" to IAttributeInfo.java, and I added a parameter to
IViewRule's onInitialize method.
The Groovy code was kept as close to the original as possible; I
copied in the Groovy code, and then replaced the Groovy-specific
constructs (closure-iteration on collections, literal map syntax, etc)
with equivalent Java code. The only tricky part was ensuring that
Groovy's handling of the == and != operators were translated into
.equals calls.
Change-Id: Idf7660ddea3766eac0a4a65ce6524d3f5119f7b2
The Android Open Source Project [Fri, 22 Oct 2010 18:11:15 +0000 (11:11 -0700)]
merge from open-source master
Change-Id: Icdc598b33a15914a22d3506dd7fd53433c8aae8b
The Android Open Source Project [Fri, 22 Oct 2010 18:00:00 +0000 (11:00 -0700)]
merge from tools_r8
Change-Id: I5d09a769d021b995afde56faef4d757124bef5e1
Xavier Ducrohet [Fri, 22 Oct 2010 17:54:16 +0000 (10:54 -0700)]
Merge "Remove temporary disabling of proguard during ADT export." into tools_r8
Xavier Ducrohet [Fri, 22 Oct 2010 17:53:21 +0000 (10:53 -0700)]
Remove temporary disabling of proguard during ADT export.
Change-Id: Iadff55b838b7317f9dcc518d5246a2889f7a5f39
The Android Open Source Project [Fri, 22 Oct 2010 01:43:40 +0000 (18:43 -0700)]
merge from open-source master
Change-Id: Ic22681f1cc216d9d5ff3b4565c3d27ba072d8e1f
The Android Open Source Project [Fri, 22 Oct 2010 01:32:21 +0000 (18:32 -0700)]
merge from tools_r8
Change-Id: Ic11d6314c05e66d9c60a53dcdb88b8de279a3d5b
Xavier Ducrohet [Fri, 22 Oct 2010 01:20:48 +0000 (18:20 -0700)]
Merge "Workaround failure to collect test info for large test suites." into tools_r8
The Android Open Source Project [Wed, 20 Oct 2010 20:50:55 +0000 (13:50 -0700)]
merge from open-source master
Change-Id: Id53da69b0afd3c9d5e316ca66ec2edafa7d17265
The Android Open Source Project [Wed, 20 Oct 2010 20:37:38 +0000 (13:37 -0700)]
merge from tools_r8
Change-Id: I139ff9bb81b703f7fa305b1234e3c6330012d3f8
Xavier Ducrohet [Wed, 20 Oct 2010 20:24:06 +0000 (13:24 -0700)]
Merge "Integrate
6db57208 into tools_r8. DO NOT MERGE." into tools_r8
The Android Open Source Project [Wed, 20 Oct 2010 20:23:59 +0000 (13:23 -0700)]
merge from open-source master
Change-Id: I4b575de4a23bc5086076297cf1b177ee9d1b2fc0
Xavier Ducrohet [Wed, 20 Oct 2010 20:23:48 +0000 (13:23 -0700)]
Merge "Integrate
5397067d into tools_r8. DO NOT MERGE." into tools_r8
Xavier Ducrohet [Wed, 20 Oct 2010 20:23:41 +0000 (13:23 -0700)]
Merge "Integrate
17398174 into tools_r8. DO NOT MERGE." into tools_r8
Bill Napier [Mon, 18 Oct 2010 07:00:20 +0000 (00:00 -0700)]
Integrate
6db57208 into tools_r8. DO NOT MERGE.
Initial cut at MonkeyRecorder.
MonkeyRecorder (and MonkeyPlayback) are a set of tools for using MonkeyRunner to record and playback actions. The current implementation is not very sophisticated, but it works.
Please don't review yet. Needs a lot of style cleanup.
Change-Id: I79ed1b548d295563a184af5fb945140f93586b17
Bill Napier [Sun, 17 Oct 2010 22:47:04 +0000 (15:47 -0700)]
Integrate
5397067d into tools_r8. DO NOT MERGE.
Fix field visibility by ensuring they stay in __dict__.
Change-Id: I2e93dd4ba8c8cc3f05ca477091932268ec5d78da
Bill Napier [Mon, 18 Oct 2010 20:42:29 +0000 (13:42 -0700)]
Integrate
17398174 into tools_r8. DO NOT MERGE.
Make MonkeyRunner's adb finding more robust.
This includes fixes for running out of the SDK.
Change-Id: Ie73ccd391b34f8a75f23738a97c42902f91af841
The Android Open Source Project [Wed, 20 Oct 2010 20:12:44 +0000 (13:12 -0700)]
merge from tools_r8
Change-Id: I50e3e6ada3a357bd519d5ccd7465ca236a525b84
Xavier Ducrohet [Wed, 20 Oct 2010 20:06:40 +0000 (13:06 -0700)]
Merge "Gen folder should not be derived." into tools_r8
Xavier Ducrohet [Wed, 20 Oct 2010 18:51:59 +0000 (11:51 -0700)]
Gen folder should not be derived.
This fix the issue where gen is not present after project
creation (it was actually created then deleted as part of a clean
up phase)
Change-Id: I25cd67c076ed401b482d97292640c08a2a7a5830
Brett Chabot [Wed, 20 Oct 2010 03:02:52 +0000 (20:02 -0700)]
Workaround failure to collect test info for large test suites.
Add a small delay between tests when collecting test info.
Bug
1796494
Change-Id: I57061d7a21f8c8517c03101e28a3de82cdd61cd8
The Android Open Source Project [Tue, 19 Oct 2010 20:36:11 +0000 (13:36 -0700)]
merge from open-source master
Change-Id: I10e9ec18dedd9196d1f33378abec63ddb65407af
Tor Norbye [Tue, 19 Oct 2010 20:31:50 +0000 (13:31 -0700)]
Merge "Fix ddms filechooser behavior and Mac accelerator"
The Android Open Source Project [Tue, 19 Oct 2010 20:24:46 +0000 (13:24 -0700)]
merge from open-source master
Change-Id: I39fa2caa1fe18577ee8a0d1f680ebd0665a2f6e4
Tor Norbye [Tue, 19 Oct 2010 04:32:26 +0000 (21:32 -0700)]
Fix ddms filechooser behavior and Mac accelerator
Fix a couple of issues in ddms:
First, fix the code to remember the path you last opened the file
chooser with; if there is nothing in $lastImageSaveDir, it should look
at $imageSaveDir (which is the variable the default setting
($user.home) is initialized into).
Second, and this seems to be Mac specific, the
FileDialog.getFilterPath() call does not return the path you have
navigated to, which means that on the Mac it never sets
$lastImageSaveDir correctly - it always sets it to the original
suggestion. The fix is trivial - use File#getParent instead which does
the String manipulation to extract the parent portion of a string
which represents a path.
Finally, on Macs (only), make the keybindings use the Command key
instead of the Control key since that's the norm.
Change-Id: I1b0f381606f5373ddad973754e49ce07856a9bae
The Android Open Source Project [Tue, 19 Oct 2010 20:12:21 +0000 (13:12 -0700)]
merge from tools_r8
Change-Id: I9a270a8b095100a7ff54338d60aa3990ec46b677
Xavier Ducrohet [Tue, 19 Oct 2010 20:07:31 +0000 (13:07 -0700)]
Merge "Integrate
9174add7 into tools_r8. DO NOT MERGE" into tools_r8