Commit Graph

1173 Commits

Author SHA1 Message Date
Xavier Ducrohet
efc6be0e33 ADT now launches app as if launched from launcher.
BUG 2243142

Change-Id: I793a35a92cf0f818242e74e4794d74a681b25d83
2009-11-06 10:50:27 -08:00
Xavier Ducrohet
e9373a4211 am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-mr2

* commit '7853d243aa0f2947249aa610972d74622cdddd82':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:26:37 -08:00
Xavier Ducrohet
c48867aab4 Move Tools to rev 5, and ADT to 0.9.5
Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445
2009-11-06 10:05:53 -08:00
Android (Google) Code Review
c0446aa9d2 Merge change I4d2a57bc into eclair-mr2
* changes:
  Moved values into attributes of xml elements where they belong
2009-11-05 16:50:10 -05:00
Xavier Ducrohet
7f305ce770 Ignore hidden files and vi swap files during packaging. (do not merge)
BUG #2233458

This is integrated from eclair.
2009-11-04 14:46:40 -08:00
Brett Chabot
fd893b5fb0 Fix ADT test data references.
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
2009-11-03 12:34:46 -08:00
Raphael
03684b9d88 am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair

* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:17:52 -08:00
Xavier Ducrohet
f9e0b26442 Move check for hidden files in the proper method.
Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148
2009-11-03 11:23:06 -08:00
Raphael
8d700bdf67 SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG 2233458
2009-11-03 09:40:55 -08:00
Xavier Ducrohet
b159651709 Ignore hidden files and vi swap files during packaging.
BUG #2233458

Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
2009-11-02 18:31:46 -08:00
Raphael
4bf2ce27a0 SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
SDK BUG 2232091

Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5
2009-11-02 16:43:32 -08:00
Xavier Ducrohet
0dd85d89fa Only apply permission to files with +x (do not merge)
integrated from eclair branch.
2009-11-02 12:13:45 -08:00
Android (Google) Code Review
192d5db1fe Merge change Ied3304a0 into eclair
* changes:
  Only apply permission to files with +x
2009-11-02 14:40:10 -05:00
Xavier Ducrohet
67ba2de9e7 Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
2009-10-30 16:34:47 -07:00
Raphael
8a370089b8 am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair

* commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de':
  SDK Manager: Display error when saving settings
2009-10-30 13:01:22 -07:00
Raphael
d3f9eb79c7 SDK Manager: Display error when saving settings
SDK BUG 2226029

Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
2009-10-29 21:28:45 -07:00
Raphael
7a42c8f4d5 am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit 'be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair

* commit 'be4cbcc2267e3778776c68785b52f871f72c67f7':
  SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 14:31:05 -07:00
Raphael
be4cbcc226 SDK Manager: fix NPE in AVD > Start when there's no skin name.
Also log missing config.ini path.

SDK BUG 2223760

Change-Id: I4517005e03e90c0b5a52bcb40b0d32eddd03c1f3
2009-10-29 13:52:56 -07:00
Android (Google) Code Review
da78534e3a Merge change Ia94518e3 into eclair
* changes:
  ADT test fixes.
2009-10-29 16:45:53 -04:00
Android (Google) Code Review
940073e267 Merge change I28aa1104 into eclair-sdk
* changes:
  SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 16:22:26 -04:00
Android (Google) Code Review
dd77d69f9e Merge change I6b97fee0 into eclair-sdk
* changes:
  SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 16:14:35 -04:00
Android (Google) Code Review
3c5557bb5e Merge change Idd4c6e5f into eclair-sdk
* changes:
  Move SDK tools package to r4
2009-10-29 16:00:32 -04:00
Raphael
93ead92dbb SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.

Change-Id: I6b97fee06bd4e6dc36c977ffef3c25315469b766
2009-10-29 13:00:11 -07:00
Raphael
34d8e2790b SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.

SDK BUGS 2219284 2198427

Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
2009-10-29 12:56:16 -07:00
Xavier Ducrohet
f7f145dc04 am 275de810: Merge change I2089d86d into eclair-sdk
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair

* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
  Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 12:39:03 -07:00
Android (Google) Code Review
275de810e9 Merge change I2089d86d into eclair-sdk
* changes:
  Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 15:28:07 -04:00
Xavier Ducrohet
dd4c6e5f3e Move SDK tools package to r4 2009-10-29 12:27:50 -07:00
Xavier Ducrohet
7bb72933c5 Fix the android launcher script to not force Java 1.5 on MacOS 2009-10-29 12:15:02 -07:00
Brett Chabot
a94518e3bc ADT test fixes.
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.

Bugs 2222616, 2218682
2009-10-28 18:22:15 -07:00
Android (Google) Code Review
107b1a9ee6 Merge change Ie496edfa into eclair
* changes:
  SDK Updater: don't load sdk-repo XML that failed to validate.
2009-10-27 20:57:02 -04:00
Raphael
1de51457fa SDK Updater: don't load sdk-repo XML that failed to validate.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.

SDK BUGS 2219284 2198427

Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
2009-10-27 17:48:16 -07:00
Raphael
09c5201adc Prepare version numbers for next SDK & tools
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
2009-10-27 15:33:17 -07:00
Android (Google) Code Review
b3bca01878 Merge change I337b2644 into eclair
* changes:
  SDK Manager > AVD > Start: print computed scale.
2009-10-26 19:12:43 -04:00
Xavier Ducrohet
d5f6e05716 ADT/GEL: Reenable config popup when switching from a device with only 1 config
Change-Id: I7f60270ffbcaae420f4da245ff3d9b271885fa37
BUG: 2218975
2009-10-26 13:55:27 -07:00
Raphael
87636aef44 SDK Manager > AVD > Start: print computed scale.
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.

Change-Id: I337b264437dee81aed1bb9a1fbd11ccc9f506e88
2009-10-26 12:26:27 -07:00
Raphael
e7ff49b82d SDK Manager: properly reset tree when changing updates only
SDK BUG 2210573

Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
2009-10-23 13:45:57 -07:00
mike ritter
d1da47bfa5 Moved values into attributes of xml elements where they belong 2009-10-22 13:21:46 -07:00
Dirk Dougherty
52508ffa96 am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53' into eclair

* commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53':
  doc change only: update gae python server script (tested)
2009-10-22 11:21:34 -07:00
Raphael
a16a134a86 am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947' into eclair

* commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:20:33 -07:00
Dirk Dougherty
aa95bfe2ac doc change only: update gae python server script (tested) 2009-10-21 18:36:20 -07:00
Android (Google) Code Review
5d2a01adfe Merge change I235da4a8 into eclair-sdk
* changes:
  SDK android "update project" must not require --target parameter.
2009-10-21 16:09:28 -04:00
Raphael
842122bcf9 SDK android "update project" must not require --target parameter.
SDK BUG 2203846

Change-Id: I235da4a8892de9a4334d5630667484220472f168
2009-10-21 12:52:11 -07:00
Raphael
46b5e20d2b SDK Updater: switch UdpateChooserDialog to jface.
Change-Id: I03351f1b21b81d1654ce4ecb1c8ca5846f1fb7c4
2009-10-21 12:10:47 -07:00
Raphael
e97d99d02c am d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit 'd58cd1b5d3bfc2433201fbe22621f4924a89c04d' into eclair

* commit 'd58cd1b5d3bfc2433201fbe22621f4924a89c04d':
  SDK Updater: UI polish
2009-10-20 15:32:13 -07:00
Raphael
d75c03e4f1 am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '7c1adfe76fbf89cc76ff51bf0d228c13213fe563' into eclair

* commit '7c1adfe76fbf89cc76ff51bf0d228c13213fe563':
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 15:32:09 -07:00
Android (Google) Code Review
d58cd1b5d3 Merge change I075d2eae into eclair-sdk
* changes:
  SDK Updater: UI polish
2009-10-20 18:18:18 -04:00
Android (Google) Code Review
7c1adfe76f Merge change I5b1f8bca into eclair-sdk
* changes:
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 18:16:59 -04:00
Raphael
ab36793247 AVD Manager: Properly disable AVD > Start > ? under Windows
SDK BUG 2201546

Change-Id: I5b1f8bcaf57f2e7f94b4109cb62a3a5eadcd24a9
2009-10-20 15:09:56 -07:00
Raphael
301eea2962 SDK Updater: UI polish
Fixes the following issues:
- Updater says it didnd't install addon and then install it
  (cause: UpdaterData was looking for an ArchiveInfo in a map of Archive)
- Added a label explaining the [*] in the dependency list.
- Added the originating site to the long description in the package chooser.
- Display downloading/installing comments in the result window.
- Fixed app name in dialog when tools are updated.

Change-Id: I075d2eaeb357f33671f7e9e70a906ca48000908d
2009-10-20 14:54:30 -07:00
Raphael
90b60a3985 am c9b04450: Merge change I4151529e into eclair-sdk
Merge commit 'c9b04450ef204e03de3f3da886cd45808550dfbc' into eclair

* commit 'c9b04450ef204e03de3f3da886cd45808550dfbc':
  Fix potential NPE in manifest editor when switching SDKs
2009-10-20 13:19:58 -07:00