Commit Graph

2487 Commits

Author SHA1 Message Date
Android (Google) Code Review
a2a6a5064c am 5868443a: Merge change 2770 into donut
Merge commit '5868443aa40d2bee9f953eccaca70cadb0efe675'

* commit '5868443aa40d2bee9f953eccaca70cadb0efe675':
  SDK Updater stuff.
2009-06-01 11:19:29 -07:00
Android (Google) Code Review
5868443aa4 Merge change 2770 into donut
* changes:
  SDK Updater stuff.
2009-06-01 11:17:19 -07:00
Raphael Moll
6f56ebc737 AI 149397: ADT 1807821 and 1841824: Fixes in android tool
- Bug 1807821: create avd -f option does nothing.
  - Bug 1841824: NPE during AVD delete or update.
  BUG=1841824,1807821

Automated import of CL 149397
2009-05-29 16:39:42 -07:00
Android (Google) Code Review
e5ee8856eb am a23df99e: Merge change 2749 into donut
Merge commit 'a23df99ecf5080e4b9f819f76d7d135915b37a4a'

* commit 'a23df99ecf5080e4b9f819f76d7d135915b37a4a':
  Make CompiledResourcesMonitor#getRClassName more error proof.
2009-05-29 15:38:44 -07:00
Android (Google) Code Review
a23df99ecf Merge change 2749 into donut
* changes:
  Make CompiledResourcesMonitor#getRClassName more error proof.
2009-05-29 15:36:42 -07:00
Xavier Ducrohet
3106768f31 Make CompiledResourcesMonitor#getRClassName more error proof. 2009-05-29 15:18:24 -07:00
Jack Palevich
055fcd23fb Use bash instead of sh because of the '[[' command
The '[[' command is not guaranteed to be present in /bin/sh, and in fact
is missing in stock Ubuntu 8.04
2009-05-28 15:10:26 -07:00
Jack Palevich
dd3cf52f6f Improve Linux 32-bit JVM detection logic.
Now we detect if the JVM we are about to run is 32-bit or not,
rather than checking if the CPU is capable of executing 64-bit
code or not.
2009-05-28 15:09:59 -07:00
Jack Palevich
c73dabc0d7 Use bash instead of sh because of the '[[' command
The '[[' command is not guaranteed to be present in /bin/sh, and in fact
is missing in stock Ubuntu 8.04
2009-05-28 14:53:02 -07:00
Jack Palevich
5715029663 Improve Linux 32-bit JVM detection logic.
Now we detect if the JVM we are about to run is 32-bit or not,
rather than checking if the CPU is capable of executing 64-bit
code or not.
2009-05-27 18:06:52 -07:00
Raphael
2e46d39eb8 SDK Updater stuff. 2009-05-27 11:12:31 -07:00
Android (Google) Code Review
90dabc9120 am e0fbae30: Merge change 2472 into donut
Merge commit 'e0fbae303c71b1be68e581e9b686e8a0104e657f'

* commit 'e0fbae303c71b1be68e581e9b686e8a0104e657f':
  ADT #1877529: Fixes a couple potential NPEs in content assists.
2009-05-26 15:29:13 -07:00
Android (Google) Code Review
e0fbae303c Merge change 2472 into donut
* changes:
  ADT #1877529: Fixes a couple potential NPEs in content assists.
2009-05-26 15:26:00 -07:00
Xavier Ducrohet
feb725e826 am ce803ae7: Update some class names in plugin.xml that were not updated by the refactoring.
Merge commit 'ce803ae7b9162f92f43e64922b7d610e652ab468'

* commit 'ce803ae7b9162f92f43e64922b7d610e652ab468':
  Update some class names in plugin.xml that were not updated by the refactoring.
2009-05-26 15:17:30 -07:00
Xavier Ducrohet
ce803ae7b9 Update some class names in plugin.xml that were not updated by the refactoring. 2009-05-26 15:09:02 -07:00
Raphael
6235bff51d ADT #1877529: Fixes a couple potential NPEs in content assists.
Can't reproduce the NPE in ContentAssist listed in the
bug. However if things go really wrong there are a couple
objects that can be null so let's be defensive about them.
2009-05-26 15:08:33 -07:00
Xavier Ducrohet
d236e04066 am ca2281d8: Fix wrong path to externalized string file.
Merge commit 'ca2281d885ffcc3f6fb719901d373d9cb192e3f2'

* commit 'ca2281d885ffcc3f6fb719901d373d9cb192e3f2':
  Fix wrong path to externalized string file.
2009-05-26 13:52:05 -07:00
Xavier Ducrohet
ca2281d885 Fix wrong path to externalized string file.
This is from the big refactoring that moved everything into internal.
2009-05-26 13:44:02 -07:00
Android (Google) Code Review
71eaf34b36 am 5ad70bba: Merge change 2447 into donut
Merge commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2'

* commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2':
  Fix the uninstall target in the Ant build script.
2009-05-26 13:42:15 -07:00
Xavier Ducrohet
55b0512f2b Fix the uninstall target in the Ant build script.
the uninstall parameter is a value (the application package), but the Ant
task was incorrectly using "path" for the argument.
2009-05-26 12:25:28 -07:00
Android (Google) Code Review
41185f0de4 am 3276b8e8: Merge change 2384 into donut
Merge commit '3276b8e868bb771d2a0bfcc2c83fae65cae172c7'

* commit '3276b8e868bb771d2a0bfcc2c83fae65cae172c7':
  SDK Updater: display properties of sources and packages.
2009-05-22 17:22:20 -07:00
Android (Google) Code Review
3276b8e868 Merge change 2384 into donut
* changes:
  SDK Updater: display properties of sources and packages.
2009-05-22 17:20:35 -07:00
Raphael
f864c1bf93 SDK Updater: display properties of sources and packages. 2009-05-22 16:51:51 -07:00
Xavier Ducrohet
be2241e2b7 am dc10c2e5: Update \'android update adb\' to the new file format for 3rd USB Vendor IDs.
Merge commit 'dc10c2e5a388f22fd0e061521dac61b6751b23f4'

* commit 'dc10c2e5a388f22fd0e061521dac61b6751b23f4':
  Update 'android update adb' to the new file format for 3rd USB Vendor IDs.
2009-05-22 16:04:13 -07:00
Xavier Ducrohet
dc10c2e5a3 Update 'android update adb' to the new file format for 3rd USB Vendor IDs.
The new file format is simply 1 ID per line, no need for a count value.
Lines starting with '#' are comments and therefore ignored.
2009-05-22 15:47:13 -07:00
Android (Google) Code Review
2f740babc0 am 0db48f76: Merge change 2360 into donut
Merge commit '0db48f76fb99cdc9d0ac1fafd41f82e51996de06'

* commit '0db48f76fb99cdc9d0ac1fafd41f82e51996de06':
  Make 'android update adb' write the USB vendor IDs in hexa.
2009-05-22 14:13:37 -07:00
Android (Google) Code Review
0db48f76fb Merge change 2360 into donut
* changes:
  Make 'android update adb' write the USB vendor IDs in hexa.
2009-05-22 14:11:30 -07:00
Xavier Ducrohet
774ac9a0dc Make 'android update adb' write the USB vendor IDs in hexa. 2009-05-22 13:47:07 -07:00
Android (Google) Code Review
953d1855a3 am 906e6529: Merge change 2300 into donut
Merge commit '906e6529fce5e5c4473d9bcdb05c03b13dac2b8f'

* commit '906e6529fce5e5c4473d9bcdb05c03b13dac2b8f':
  SDK Updater: some refactoring and some new features.
2009-05-22 12:32:57 -07:00
Android (Google) Code Review
906e6529fc Merge change 2300 into donut
* changes:
  SDK Updater: some refactoring and some new features.
2009-05-22 12:30:35 -07:00
Android (Google) Code Review
2b210d79d9 am c3515737: Merge change 2281 into donut
Merge commit 'c35157377ba06eeef32bc6eaf582fd6e4c9805a8'

* commit 'c35157377ba06eeef32bc6eaf582fd6e4c9805a8':
  Moved updateAdb into SdkManager and updated with new adb_usb.ini format.
2009-05-22 11:32:03 -07:00
Raphael
1c7b811fe4 SDK Updater: some refactoring and some new features.
The refactoring part involves moving as much as possible stuff
in SdkLib/internal/repository.

The UI has moved in SdkUiLib/internal/repository except a specific
public wrapper for calling the Sdk Updater window.

There are also a bunch of new classes to handle the internal
structures: Package is the base type and to match the XML element
names we have PlatformPackage, AddonPackage, DocPackage and
ToolPackage.

All headers have been fixed.
2009-05-22 11:31:50 -07:00
Android (Google) Code Review
c35157377b Merge change 2281 into donut
* changes:
  Moved updateAdb into SdkManager and updated with new adb_usb.ini format.
2009-05-22 10:44:46 -07:00
Xavier Ducrohet
0064943f50 Moved updateAdb into SdkManager and updated with new adb_usb.ini format.
New format is: 1 number per line. First number is vendor ID count, followed
by  the vendor IDs themselves. Comment lines starting with # accepted.
2009-05-21 18:11:36 -07:00
Raphael
e56dc15be2 am cbfa85a4: Sdk Updater: Split UI in window and independant composites.
Merge commit 'cbfa85a410cc51330454e6318bbdd88dd17b2401'

* commit 'cbfa85a410cc51330454e6318bbdd88dd17b2401':
  Sdk Updater: Split UI in window and independant composites.
2009-05-21 15:34:49 -07:00
Raphael
cbfa85a410 Sdk Updater: Split UI in window and independant composites. 2009-05-21 15:22:50 -07:00
Android (Google) Code Review
2e41227a6e am 38ea3827: Merge change 2122 into donut
Merge commit '38ea38278923db2823f159df7d53e7964466bc2e'

* commit '38ea38278923db2823f159df7d53e7964466bc2e':
  Add support for USB Vendor ID in the add-ons.
2009-05-21 10:16:40 -07:00
Android (Google) Code Review
38ea382789 Merge change 2122 into donut
* changes:
  Add support for USB Vendor ID in the add-ons.
2009-05-21 10:14:27 -07:00
Xavier Ducrohet
4817a2b5b3 Add support for USB Vendor ID in the add-ons.
The add-on manifest can now declare a USB vendor ID with the line
   usb-vendor=<id>
The ID must be a 16 hexadecimal value in the format 0xABCD.

The 'android' tool now has a new command 'android upate abd' that will create
a file called 'adb_usb.ini' in ~/.android/
This file will be read by adb to add support to those new vendor IDs.
2009-05-20 18:06:15 -07:00
Android (Google) Code Review
435f32e41c am 06b9f977: Merge change 2118 into donut
Merge commit '06b9f977c36980e0e8ac4bca4fad6da0b46eac7a'

* commit '06b9f977c36980e0e8ac4bca4fad6da0b46eac7a':
  Add work-around for running DDMS on 64-bit Linux.
2009-05-20 16:14:15 -07:00
Jack Palevich
92b6f2b72b Add work-around for running DDMS on 64-bit Linux. 2009-05-20 14:42:04 -07:00
Android (Google) Code Review
b5fb938998 am 7114c7bf: Merge change 2066 into donut
Merge commit '7114c7bf1c02390c7e328775aadc400c3b2b8603'

* commit '7114c7bf1c02390c7e328775aadc400c3b2b8603':
  SDK Updater: Fetch source XML, display them in tree.
2009-05-20 12:06:10 -07:00
Raphael
08226b31f8 SDK Updater: Fetch source XML, display them in tree.
There's a notion of an asynchronous task with a progress bar & status UI.
That's still just experimental. Will need some refactoring, etc.
2009-05-20 11:58:16 -07:00
Android (Google) Code Review
3206e3df5f am 02347199: Merge change 1834 into donut
Merge commit '02347199b12c796414e17d615a010f7d72344e2a'

* commit '02347199b12c796414e17d615a010f7d72344e2a':
  Skeleton App Windows for Sdk Updater built using SWT Designer.
2009-05-15 21:32:50 -07:00
Android (Google) Code Review
02347199b1 Merge change 1834 into donut
* changes:
  Skeleton App Windows for Sdk Updater built using SWT Designer. The window is shown when the "android" tool is invoked with no parameter.
2009-05-15 18:51:02 -07:00
Raphael
49060501cc Skeleton App Windows for Sdk Updater built using SWT Designer.
The window is shown when the "android" tool is invoked with no parameter.
2009-05-15 17:36:26 -07:00
Android (Google) Code Review
47d9b4efb2 am d06f8e2f: Merge change 1730 into donut
Merge commit 'd06f8e2f4cb97b5a397793ba7b53e62ab73925f8'

* commit 'd06f8e2f4cb97b5a397793ba7b53e62ab73925f8':
  Make the ddmlib API use IDevice instead of Device
2009-05-15 16:25:37 -07:00
Android (Google) Code Review
d06f8e2f4c Merge change 1730 into donut
* changes:
  Make the ddmlib API use IDevice instead of Device
2009-05-15 15:21:13 -07:00
Xavier Ducrohet
2dec13440e am 5048d7e4: Update ADT feature dependency.
Merge commit '5048d7e4b3467eaafa4d06ca1978ad86c3a1f3d0'

* commit '5048d7e4b3467eaafa4d06ca1978ad86c3a1f3d0':
  Update ADT feature dependency.
2009-05-15 15:05:47 -07:00
Xavier Ducrohet
5048d7e4b3 Update ADT feature dependency. 2009-05-15 14:45:17 -07:00