OSDN Git Service

android-x86/sdk.git
13 years agomerge from open-source master
The Android Open Source Project [Mon, 25 Oct 2010 21:20:18 +0000 (14:20 -0700)]
merge from open-source master

Change-Id: I922e77a1fde90a6d73cc5f9afcf79f11343e18a2

13 years agoMerge "Add layout unit tests"
Tor Norbye [Mon, 25 Oct 2010 21:12:17 +0000 (14:12 -0700)]
Merge "Add layout unit tests"

13 years agoAdd 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

13 years agomerge from open-source master
The Android Open Source Project [Mon, 25 Oct 2010 02:26:29 +0000 (19:26 -0700)]
merge from open-source master

Change-Id: I4bb2ec08eab7d1d7340c02ee7619dc9db9531c11

13 years agoMerge "Port layout rules to Java"
Tor Norbye [Mon, 25 Oct 2010 02:21:07 +0000 (19:21 -0700)]
Merge "Port layout rules to Java"

13 years agoPort 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

13 years agomerge from open-source master
The Android Open Source Project [Fri, 22 Oct 2010 18:11:15 +0000 (11:11 -0700)]
merge from open-source master

Change-Id: Icdc598b33a15914a22d3506dd7fd53433c8aae8b

13 years agomerge from tools_r8
The Android Open Source Project [Fri, 22 Oct 2010 18:00:00 +0000 (11:00 -0700)]
merge from tools_r8

Change-Id: I5d09a769d021b995afde56faef4d757124bef5e1

13 years agoMerge "Remove temporary disabling of proguard during ADT export." into tools_r8
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

13 years agoRemove temporary disabling of proguard during ADT export.
Xavier Ducrohet [Fri, 22 Oct 2010 17:53:21 +0000 (10:53 -0700)]
Remove temporary disabling of proguard during ADT export.

Change-Id: Iadff55b838b7317f9dcc518d5246a2889f7a5f39

13 years agomerge from open-source master
The Android Open Source Project [Fri, 22 Oct 2010 01:43:40 +0000 (18:43 -0700)]
merge from open-source master

Change-Id: Ic22681f1cc216d9d5ff3b4565c3d27ba072d8e1f

13 years agomerge from tools_r8
The Android Open Source Project [Fri, 22 Oct 2010 01:32:21 +0000 (18:32 -0700)]
merge from tools_r8

Change-Id: Ic11d6314c05e66d9c60a53dcdb88b8de279a3d5b

13 years agoMerge "Workaround failure to collect test info for large test suites." into tools_r8
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

13 years agomerge from open-source master
The Android Open Source Project [Wed, 20 Oct 2010 20:50:55 +0000 (13:50 -0700)]
merge from open-source master

Change-Id: Id53da69b0afd3c9d5e316ca66ec2edafa7d17265

13 years agomerge from tools_r8
The Android Open Source Project [Wed, 20 Oct 2010 20:37:38 +0000 (13:37 -0700)]
merge from tools_r8

Change-Id: I139ff9bb81b703f7fa305b1234e3c6330012d3f8

13 years agoMerge "Integrate 6db57208 into tools_r8. DO NOT MERGE." into tools_r8
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

13 years agomerge from open-source master
The Android Open Source Project [Wed, 20 Oct 2010 20:23:59 +0000 (13:23 -0700)]
merge from open-source master

Change-Id: I4b575de4a23bc5086076297cf1b177ee9d1b2fc0

13 years agoMerge "Integrate 5397067d into tools_r8. DO NOT MERGE." into tools_r8
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

13 years agoMerge "Integrate 17398174 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

13 years agoIntegrate 6db57208 into tools_r8. DO NOT MERGE.
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

13 years agoIntegrate 5397067d into tools_r8. DO NOT MERGE.
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

13 years agoIntegrate 17398174 into tools_r8. DO NOT MERGE.
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

13 years agomerge from tools_r8
The Android Open Source Project [Wed, 20 Oct 2010 20:12:44 +0000 (13:12 -0700)]
merge from tools_r8

Change-Id: I50e3e6ada3a357bd519d5ccd7465ca236a525b84

13 years agoMerge "Gen folder should not be derived." into tools_r8
Xavier Ducrohet [Wed, 20 Oct 2010 20:06:40 +0000 (13:06 -0700)]
Merge "Gen folder should not be derived." into tools_r8

13 years agoGen folder should not be derived.
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

13 years agoWorkaround failure to collect test info for large test suites.
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

13 years agomerge from open-source master
The Android Open Source Project [Tue, 19 Oct 2010 20:36:11 +0000 (13:36 -0700)]
merge from open-source master

Change-Id: I10e9ec18dedd9196d1f33378abec63ddb65407af

13 years agoMerge "Fix ddms filechooser behavior and Mac accelerator"
Tor Norbye [Tue, 19 Oct 2010 20:31:50 +0000 (13:31 -0700)]
Merge "Fix ddms filechooser behavior and Mac accelerator"

13 years agomerge from open-source master
The Android Open Source Project [Tue, 19 Oct 2010 20:24:46 +0000 (13:24 -0700)]
merge from open-source master

Change-Id: I39fa2caa1fe18577ee8a0d1f680ebd0665a2f6e4

13 years agoFix ddms filechooser behavior and Mac accelerator
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

13 years agomerge from tools_r8
The Android Open Source Project [Tue, 19 Oct 2010 20:12:21 +0000 (13:12 -0700)]
merge from tools_r8

Change-Id: I9a270a8b095100a7ff54338d60aa3990ec46b677

13 years agoMerge "Integrate 9174add7 into tools_r8. DO NOT MERGE" into tools_r8
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

13 years agoMerge "Integrate 5b6aa7d0 into tools_r8. DO NOT MERGE." into tools_r8
Xavier Ducrohet [Tue, 19 Oct 2010 20:07:15 +0000 (13:07 -0700)]
Merge "Integrate 5b6aa7d0 into tools_r8. DO NOT MERGE." into tools_r8

13 years agoIntegrate 9174add7 into tools_r8. DO NOT MERGE
Raphael Moll [Tue, 19 Oct 2010 19:08:26 +0000 (12:08 -0700)]
Integrate 9174add7 into tools_r8. DO NOT MERGE

SDK Manager fix: message to restart after tools update.

The latest CL made this appear after a platform-tools update instead.

Change-Id: Ib52cf88adfb1557c112c3a8153dad536c5932fa3

13 years agoIntegrate 5b6aa7d0 into tools_r8. DO NOT MERGE.
Raphael Moll [Tue, 19 Oct 2010 19:00:07 +0000 (12:00 -0700)]
Integrate 5b6aa7d0 into tools_r8. DO NOT MERGE.

SDK Manager: addon schema version number in about box.

Change-Id: I35d4e1db042282e269e3d1247d36ffa0e44291d5

13 years agomerge from open-source master
The Android Open Source Project [Tue, 19 Oct 2010 19:22:42 +0000 (12:22 -0700)]
merge from open-source master

Change-Id: Ifef15bbc14a27416d3b023d13d91d76a99f4b470

13 years agoMerge "SDK Manager fix: message to restart after tools update."
Raphael Moll [Tue, 19 Oct 2010 19:13:26 +0000 (12:13 -0700)]
Merge "SDK Manager fix: message to restart after tools update."

13 years agoMerge "SDK Manager: addon schema version number in about box."
Raphael Moll [Tue, 19 Oct 2010 19:13:11 +0000 (12:13 -0700)]
Merge "SDK Manager: addon schema version number in about box."

13 years agoSDK Manager fix: message to restart after tools update.
Raphael Moll [Tue, 19 Oct 2010 19:08:26 +0000 (12:08 -0700)]
SDK Manager fix: message to restart after tools update.

The latest CL made this appear after a platform-tools update instead.

Change-Id: I5e27612b3fa6fd7e53cd10a369b2d5eba19a168b

13 years agoSDK Manager: addon schema version number in about box.
Raphael Moll [Tue, 19 Oct 2010 19:00:07 +0000 (12:00 -0700)]
SDK Manager: addon schema version number in about box.

Change-Id: I2a54180f46e52cba931154ae57826c6df22b6a07

13 years agomerge from open-source master
The Android Open Source Project [Tue, 19 Oct 2010 18:45:09 +0000 (11:45 -0700)]
merge from open-source master

Change-Id: Ifd03cf004627f0a7d7eeb9665333016ef6d9de7a

13 years agoMerge "Update application icons for sdkmanager and ddms"
Tor Norbye [Tue, 19 Oct 2010 18:41:46 +0000 (11:41 -0700)]
Merge "Update application icons for sdkmanager and ddms"

13 years agomerge from open-source master
The Android Open Source Project [Tue, 19 Oct 2010 18:03:48 +0000 (11:03 -0700)]
merge from open-source master

Change-Id: I40792602007ee77f51b8d4cfcf1ab1daced63785

13 years agoMerge "Initial cut at MonkeyRecorder."
Bill Napier [Tue, 19 Oct 2010 17:54:46 +0000 (10:54 -0700)]
Merge "Initial cut at MonkeyRecorder."

13 years agoMerge "Fix field visibility by ensuring they stay in __dict__."
Bill Napier [Tue, 19 Oct 2010 17:54:31 +0000 (10:54 -0700)]
Merge "Fix field visibility by ensuring they stay in __dict__."

13 years agoMerge "Make MonkeyRunner's adb finding more robust."
Bill Napier [Tue, 19 Oct 2010 17:54:18 +0000 (10:54 -0700)]
Merge "Make MonkeyRunner's adb finding more robust."

13 years agomerge from open-source master
The Android Open Source Project [Tue, 19 Oct 2010 17:53:03 +0000 (10:53 -0700)]
merge from open-source master

Change-Id: I4cb73791fd97f2279e5e28258814d8986f9db4dc

13 years agomerge from tools_r8
The Android Open Source Project [Tue, 19 Oct 2010 17:36:28 +0000 (10:36 -0700)]
merge from tools_r8

Change-Id: I2d68e2e8463c9200f600deed4d7a4b3e55a6dc64

13 years agoUpdate application icons for sdkmanager and ddms
Tor Norbye [Tue, 19 Oct 2010 04:34:46 +0000 (21:34 -0700)]
Update application icons for sdkmanager and ddms

Update the dock icon used on Macs for the sdkmanager to one that has
transparency, just as the emulator icon already does. This is the norm
on Macs.

Update the application icon used for ddms to be an android with a
wrench, in a similar style to the other tool icons.

This icon is also transparent, which I hope will work on Windows - it
would be great if Raphael could verify that (and I should probably try
to get a Windows image into my VMWare install so I can do these checks
myself in the future.)

Change-Id: Icd0954cb77ba0845034a79bf9df6dd271019632e

13 years agomerge from open-source master
The Android Open Source Project [Tue, 19 Oct 2010 00:51:51 +0000 (17:51 -0700)]
merge from open-source master

Change-Id: Ie707f6341a9a42d222619af698f3443c6a0db472

13 years agoMerge "Integrate 13f4bf0d into Tools_r8. DO NOT MERGE." into tools_r8
Xavier Ducrohet [Tue, 19 Oct 2010 00:46:33 +0000 (17:46 -0700)]
Merge "Integrate 13f4bf0d into Tools_r8. DO NOT MERGE." into tools_r8

13 years agoIntegrate 13f4bf0d into Tools_r8. DO NOT MERGE.
Tor Norbye [Mon, 18 Oct 2010 23:19:01 +0000 (16:19 -0700)]
Integrate 13f4bf0d into Tools_r8. DO NOT MERGE.

Fix bug in LinearLayout handling of last lines

This fixes a bug where the insert-line for the last position is not
always *drawn* (the suggestion was there and the feedback rectangle
would snap to it, but the dashed line was not painted because the code
to suppress self-dragging was interfering.)

Change-Id: I853ef51a5a160f151119b7c819a3715cbde98b5a

13 years agoMerge "Fix bug in LinearLayout handling of last lines"
Xavier Ducrohet [Tue, 19 Oct 2010 00:41:58 +0000 (17:41 -0700)]
Merge "Fix bug in LinearLayout handling of last lines"

13 years agoMerge "Integrate 11357696 into tools_r8. DO NOT MERGE" into tools_r8
Xavier Ducrohet [Tue, 19 Oct 2010 00:06:42 +0000 (17:06 -0700)]
Merge "Integrate 11357696 into tools_r8. DO NOT MERGE" into tools_r8

13 years agoMerge "Integrate 3c36e33f into tools_r8. DO NOT MERGE." into tools_r8
Xavier Ducrohet [Tue, 19 Oct 2010 00:06:26 +0000 (17:06 -0700)]
Merge "Integrate 3c36e33f into tools_r8. DO NOT MERGE." into tools_r8

13 years agoIntegrate 11357696 into tools_r8. DO NOT MERGE
Raphael Moll [Mon, 18 Oct 2010 23:16:09 +0000 (16:16 -0700)]
Integrate 11357696 into tools_r8. DO NOT MERGE

SDK Manager: Restart ADB after platform-tools update.

Change-Id: Ie59201a3f303e1a9a837e82cbf4a83f620b4e7f2

13 years agoIntegrate 3c36e33f into tools_r8. DO NOT MERGE.
snpe [Sun, 17 Oct 2010 16:34:51 +0000 (18:34 +0200)]
Integrate 3c36e33f into tools_r8. DO NOT MERGE.

Fixing Issue 11557:   SWTError: No more handles exception on Eclipse

Change-Id: Ie5e7d8af8ef0376cd4d3e9afcfdd328c331a5d96

13 years agomerge from open-source master
The Android Open Source Project [Mon, 18 Oct 2010 23:51:33 +0000 (16:51 -0700)]
merge from open-source master

Change-Id: I10bf5f757918a3f51acc0c57ffd835db568fef80

13 years agoMerge "SDK Manager: Restart ADB after platform-tools update."
Raphael Moll [Mon, 18 Oct 2010 23:41:57 +0000 (16:41 -0700)]
Merge "SDK Manager: Restart ADB after platform-tools update."

13 years agomerge from open-source master
The Android Open Source Project [Mon, 18 Oct 2010 23:27:59 +0000 (16:27 -0700)]
merge from open-source master

Change-Id: I5e919bd0cee0cc1ad22b55baabc1242114a7952a

13 years agoFix bug in LinearLayout handling of last lines
Tor Norbye [Mon, 18 Oct 2010 23:19:01 +0000 (16:19 -0700)]
Fix bug in LinearLayout handling of last lines

This fixes a bug where the insert-line for the last position is not
always *drawn* (the suggestion was there and the feedback rectangle
would snap to it, but the dashed line was not painted because the code
to suppress self-dragging was interfering.)

Change-Id: I601d2f747357d42b7a797a1ed30b723830d03520

13 years agoMerge "Fixing Issue 11557: SWTError: No more handles exception on Eclipse"
Xavier Ducrohet [Mon, 18 Oct 2010 23:17:39 +0000 (16:17 -0700)]
Merge "Fixing Issue 11557:   SWTError: No more handles exception on Eclipse"

13 years agoSDK Manager: Restart ADB after platform-tools update.
Raphael Moll [Mon, 18 Oct 2010 23:16:09 +0000 (16:16 -0700)]
SDK Manager: Restart ADB after platform-tools update.

Change-Id: Ie4e21e2922d2b281723a4ee3b5aeb1c3c646beba

13 years agoFixing Issue 11557: SWTError: No more handles exception on Eclipse
snpe [Sun, 17 Oct 2010 16:34:51 +0000 (18:34 +0200)]
Fixing Issue 11557:   SWTError: No more handles exception on Eclipse

Change-Id: I3eb6ddd0b11f8d16c6f441333ddd8c5a8e9dd477

13 years agomerge from open-source master
The Android Open Source Project [Mon, 18 Oct 2010 22:04:45 +0000 (15:04 -0700)]
merge from open-source master

Change-Id: I70553041e76d59bff1f4e8b65446f8c2b3254a95

13 years agoMerge "Set hover fill color"
Tor Norbye [Mon, 18 Oct 2010 22:01:48 +0000 (15:01 -0700)]
Merge "Set hover fill color"

13 years agoMerge "DexWrapper is now loaded by the SDK instead of the platforms."
Xavier Ducrohet [Mon, 18 Oct 2010 21:57:49 +0000 (14:57 -0700)]
Merge "DexWrapper is now loaded by the SDK instead of the platforms."

13 years agomerge from open-source master
The Android Open Source Project [Mon, 18 Oct 2010 21:52:30 +0000 (14:52 -0700)]
merge from open-source master

Change-Id: Icdc85324836d6ff5674ff6d391292e331b290679

13 years agoMerge "Updated changelog for ADT."
Xavier Ducrohet [Mon, 18 Oct 2010 21:42:19 +0000 (14:42 -0700)]
Merge "Updated changelog for ADT."

13 years agomerge from open-source master
The Android Open Source Project [Mon, 18 Oct 2010 21:39:19 +0000 (14:39 -0700)]
merge from open-source master

Change-Id: I154fa78c991983a495521dfe9f46ea24f21c37b4

13 years agoDexWrapper is now loaded by the SDK instead of the platforms.
Xavier Ducrohet [Mon, 18 Oct 2010 20:48:08 +0000 (13:48 -0700)]
DexWrapper is now loaded by the SDK instead of the platforms.

Since tools_r8, dx.jar is now located in platform-tools. instead
of platforms/android-<API>/tools/lib/.

There is therefore no need for all the platforms to load their
own dx.jar through reflection into DexWrapper. The SDK now does it
for all, and the builders query the SDK for the wrapper.

Change-Id: Ia79ccaf95237f2b25b43f26241e6335acc7050a3

13 years agoMerge "Missing platform toosl doesn't mean the SDK is invalid."
Xavier Ducrohet [Mon, 18 Oct 2010 21:35:24 +0000 (14:35 -0700)]
Merge "Missing platform toosl doesn't mean the SDK is invalid."

13 years agoUpdated changelog for ADT.
Xavier Ducrohet [Mon, 18 Oct 2010 21:22:33 +0000 (14:22 -0700)]
Updated changelog for ADT.

Change-Id: I523c4ecf9c037410d23c28bf5ce778f3e3d032b7

13 years agoInitial cut at MonkeyRecorder.
Bill Napier [Mon, 18 Oct 2010 07:00:20 +0000 (00:00 -0700)]
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: Id300a27294b5dc13a842fade900e8b9916b8a17b

13 years agoMake MonkeyRunner's adb finding more robust.
Bill Napier [Mon, 18 Oct 2010 20:42:29 +0000 (13:42 -0700)]
Make MonkeyRunner's adb finding more robust.

This includes fixes for running out of the SDK.

Change-Id: Ib14959929bec2b8d5514adbe405207be4ad41264

13 years agoSet hover fill color
Tor Norbye [Mon, 18 Oct 2010 18:56:07 +0000 (11:56 -0700)]
Set hover fill color

The code which paints the hover didn't actually set the hover fill color
on the graphics context so it was just blending with white. This happens
to be the color the fill was initialized to so the problem wasn't
noticeable.

Change-Id: I95f0eface23f2a772b687ba348997a3eac2d85a9

13 years agoMissing platform toosl doesn't mean the SDK is invalid.
Xavier Ducrohet [Mon, 18 Oct 2010 18:49:55 +0000 (11:49 -0700)]
Missing platform toosl doesn't mean the SDK is invalid.

Change-Id: I623edf5df8bcc9b0b1f806c49e863879fcd4fda4

13 years agomerge from open-source master
The Android Open Source Project [Mon, 18 Oct 2010 17:36:16 +0000 (10:36 -0700)]
merge from open-source master

Change-Id: I0d637499b0476ca89de4b203eea7a3f74483cc08

13 years agoMerge "SDK Manager: refuse to not install dependencies."
Raphael Moll [Mon, 18 Oct 2010 17:25:05 +0000 (10:25 -0700)]
Merge "SDK Manager: refuse to not install dependencies."

13 years agoFix field visibility by ensuring they stay in __dict__.
Bill Napier [Sun, 17 Oct 2010 22:47:04 +0000 (15:47 -0700)]
Fix field visibility by ensuring they stay in __dict__.

Change-Id: I0f632f799ac7f554bb524099208385973423a0d0

13 years agoSDK Manager: refuse to not install dependencies.
Raphael Moll [Sat, 16 Oct 2010 05:11:20 +0000 (22:11 -0700)]
SDK Manager: refuse to not install dependencies.

In the case the SDK Manager found a package that would fix
a broken dependency of the currently installed packages
(e.g. user has Tools but not Platform-Tools), it will refuse
to not install the package that would fix that dependency.

Bug: 3092907

Change-Id: Iea21c69d726b7c859bfbbffc74ba61b690c4afe0

13 years agomerge from open-source master
The Android Open Source Project [Fri, 15 Oct 2010 23:45:24 +0000 (16:45 -0700)]
merge from open-source master

Change-Id: I847d760b690af516915df4924b032a0b45c27ac7

13 years agoMerge "Fix typo in precompiler builder."
Raphael Moll [Fri, 15 Oct 2010 23:38:49 +0000 (16:38 -0700)]
Merge "Fix typo in precompiler builder."

13 years agomerge from open-source master
The Android Open Source Project [Fri, 15 Oct 2010 22:37:53 +0000 (15:37 -0700)]
merge from open-source master

Change-Id: Id9e817800d9073265930d282b07b5c743e9e6919

13 years agoFix typo in precompiler builder.
Raphael Moll [Fri, 15 Oct 2010 22:32:40 +0000 (15:32 -0700)]
Fix typo in precompiler builder.

Bug: 3102564

Change-Id: I44d60fc89e91eadf55c4f5451493f33ec5e13c73

13 years agoMerge "Editors preference page."
Xavier Ducrohet [Fri, 15 Oct 2010 22:27:12 +0000 (15:27 -0700)]
Merge "Editors preference page."

13 years agoMerge "Add in Windows batch file for monkeyrunner."
Bill Napier [Fri, 15 Oct 2010 22:18:49 +0000 (15:18 -0700)]
Merge "Add in Windows batch file for monkeyrunner."

13 years agoMerge "SDK Manager: display URL host in source tree."
Raphael Moll [Fri, 15 Oct 2010 22:18:46 +0000 (15:18 -0700)]
Merge "SDK Manager: display URL host in source tree."

13 years agomerge from open-source master
The Android Open Source Project [Fri, 15 Oct 2010 22:00:01 +0000 (15:00 -0700)]
merge from open-source master

Change-Id: Ib5eed8b3d72b3f87b2e702ed5630d13af22cea06

13 years agoMerge "SDK Manager: Fix dependencies when installing selected packages."
Raphael Moll [Fri, 15 Oct 2010 21:48:06 +0000 (14:48 -0700)]
Merge "SDK Manager: Fix dependencies when installing selected packages."

13 years agoAdd in Windows batch file for monkeyrunner.
Bill Napier [Fri, 15 Oct 2010 21:43:52 +0000 (14:43 -0700)]
Add in Windows batch file for monkeyrunner.

Change-Id: Iebe42de2c5c8eb275f6dc4756f6209726f973860

13 years agoEditors preference page.
Xavier Ducrohet [Fri, 15 Oct 2010 21:30:16 +0000 (14:30 -0700)]
Editors preference page.

For now, only the monitor density, used by the zoom control
in the GLE.

Change-Id: I01219609e6196d845d45e306f5b93c3acf0b2ee2

13 years agoSDK Manager: display URL host in source tree.
Raphael Moll [Fri, 15 Oct 2010 20:50:16 +0000 (13:50 -0700)]
SDK Manager: display URL host in source tree.

Change-Id: I2fd27d931fe9011cc2894c7179e2e14327867b94

13 years agomerge from open-source master
The Android Open Source Project [Fri, 15 Oct 2010 21:23:02 +0000 (14:23 -0700)]
merge from open-source master

Change-Id: Ib348e701b2298d9154a5a0e662d4ec267bccd64a

13 years agoMerge "Connect the resolution chooser to the zoom control in GLE"
Xavier Ducrohet [Fri, 15 Oct 2010 21:04:51 +0000 (14:04 -0700)]
Merge "Connect the resolution chooser to the zoom control in GLE"

13 years agoMerge "Project property cleanup."
Xavier Ducrohet [Fri, 15 Oct 2010 21:04:46 +0000 (14:04 -0700)]
Merge "Project property cleanup."

13 years agomerge from open-source master
The Android Open Source Project [Fri, 15 Oct 2010 20:44:23 +0000 (13:44 -0700)]
merge from open-source master

Change-Id: Ia14f6b04ea7cd24f94a0ae07522b58afa9cd7ffc

13 years agoConnect the resolution chooser to the zoom control in GLE
Xavier Ducrohet [Fri, 15 Oct 2010 20:30:45 +0000 (13:30 -0700)]
Connect the resolution chooser to the zoom control in GLE

When using the Real-Life zoom control the first time, it
will display the Resolution chooser (from the AVD start dialog)
to let the user figure out their monitor dpi.

Next Step: add the actual density to a prefs panel so that it
can be manually tweaked.

Change-Id: If2322dd077b657386ab0452f9c507cb3c0730c32

13 years agoSDK Manager: Fix dependencies when installing selected packages.
Raphael Moll [Fri, 15 Oct 2010 20:32:37 +0000 (13:32 -0700)]
SDK Manager: Fix dependencies when installing selected packages.

In the SDK Manager, when you select a specific package from an
available repository to install it, it used to not notice if there
was a broken depedency. This fixes it. It means we have to force
loading all known available repo sources to find them if necessary.

This CL fixes a minor issue: trim all URLs before trying to use
them. The CL is voluntarily a bit defensive for that. This can
happen when we load URLs from external addon sites which we do
not control.

Change-Id: I652e1fa0e74b4384d0e95819970a59519fafa05a

13 years agoMerge "Make drag and drop create a single undo operation"
Tor Norbye [Fri, 15 Oct 2010 20:33:08 +0000 (13:33 -0700)]
Merge "Make drag and drop create a single undo operation"