Commit Graph

1324 Commits

Author SHA1 Message Date
Xavier Ducrohet
c68f8c10f4 am 8507ead2: am 13dbc227: Merge change I62823795 into eclair
Merge commit '8507ead2e565728e53e6f3c54be05fd21baab7d2' into eclair-mr2-plus-aosp

* commit '8507ead2e565728e53e6f3c54be05fd21baab7d2':
  Move source.properties for doc in sync with 2.0.1
2009-11-15 14:55:20 -08:00
Xavier Ducrohet
aab6b89deb am 2e533cc0: am 05ae5d65: Merge change I229c60a9 into eclair
Merge commit '2e533cc0448af6e2add7ab346ff451dde79c1ced' into eclair-mr2-plus-aosp

* commit '2e533cc0448af6e2add7ab346ff451dde79c1ced':
  Move source.properties for platform in sync with 2.0.1
2009-11-15 14:55:10 -08:00
Xavier Ducrohet
8507ead2e5 am 13dbc227: Merge change I62823795 into eclair
Merge commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-mr2

* commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7':
  Move source.properties for doc in sync with 2.0.1
2009-11-15 14:50:49 -08:00
Xavier Ducrohet
2e533cc044 am 05ae5d65: Merge change I229c60a9 into eclair
Merge commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-mr2

* commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
  Move source.properties for platform in sync with 2.0.1
2009-11-15 14:50:44 -08:00
Android (Google) Code Review
13dbc2272e Merge change I62823795 into eclair
* changes:
  Move source.properties for doc in sync with 2.0.1
2009-11-15 13:22:41 -08:00
Xavier Ducrohet
a6bd846ac8 Move source.properties for doc in sync with 2.0.1
Change-Id: I6282379532159de597aaec50cad81b14a0c895ce
2009-11-15 13:16:01 -08:00
Android (Google) Code Review
05ae5d65fd Merge change I229c60a9 into eclair
* changes:
  Move source.properties for platform in sync with 2.0.1
2009-11-15 13:14:47 -08:00
Xavier Ducrohet
3423617276 Move source.properties for platform in sync with 2.0.1
Change-Id: I229c60a97138c70bb9b27bd0aa60670b882cb711
2009-11-15 12:52:56 -08:00
Raphael
30f366d232 am 1ef75694: am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '1ef756940f7292987a32eeab656fc8737171dc03' into eclair-mr2-plus-aosp

* commit '1ef756940f7292987a32eeab656fc8737171dc03':
  SDK Manager: fix, create temp folder before download
2009-11-14 14:55:28 -08:00
Raphael
1ef756940f am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit 'e5387db7c2dabc9954434494054295f45e86e312' into eclair-mr2

* commit 'e5387db7c2dabc9954434494054295f45e86e312':
  SDK Manager: fix, create temp folder before download
2009-11-14 14:49:14 -08:00
Raphael
e5387db7c2 am d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair

* commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6':
  SDK Manager: fix, create temp folder before download
2009-11-14 14:39:52 -08:00
Android (Google) Code Review
d2ad5e31b8 Merge change I361fb688 into eclair-sdk
* changes:
  SDK Manager: fix, create temp folder before download
2009-11-14 14:32:27 -08:00
Xavier Ducrohet
7e48a7003a Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
BUG 2256562

This is integrated from eclair
2009-11-13 16:17:12 -08:00
Xavier Ducrohet
d4929cfa19 am 250153e8: am 25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '250153e8257188269bb171bb333975860bcc1d36' into eclair-mr2-plus-aosp

* commit '250153e8257188269bb171bb333975860bcc1d36':
  Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:50:56 -08:00
Xavier Ducrohet
250153e825 am 25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-mr2

* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
  Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:46:56 -08:00
Raphael
3298a0438e SDK Manager: fix, create temp folder before download
SDK BUG 2258237

Change-Id: I361fb688558539e20af50cd0a1d805ddf4ea4828
2009-11-12 17:15:54 -08:00
Xavier Ducrohet
75e9110f13 Use SWT to write PNG screenshot now that we moved to SWT 3.3+
BUG 2256562

Change-Id: I9a181cb799b1eadc027d6357c100fc4dfb0db012
2009-11-12 13:30:02 -08:00
Raphael
d4f5e0a9dd am a7f3e75e: am 2d03b2a5: am 8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit 'a7f3e75ebb849bff947d12b3be24145c4cb9de9a' into eclair-mr2-plus-aosp

* commit 'a7f3e75ebb849bff947d12b3be24145c4cb9de9a':
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 16:23:29 -08:00
Raphael
a7f3e75ebb am 2d03b2a5: am 8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e' into eclair-mr2

* commit '2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e':
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 16:17:21 -08:00
Brett Chabot
11ea938d2a am 851c913b: am f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit '851c913b6e3cdf7cb334d4b24ae3e1079554203b' into eclair-mr2-plus-aosp

* commit '851c913b6e3cdf7cb334d4b24ae3e1079554203b':
  Update adt-tests build.properties to include new test data location.
2009-11-09 12:14:20 -08:00
Raphael
2d03b2a5d1 am 8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '8ccddf4c00464c6fee998d56da1f08b4662abf62' into eclair

* commit '8ccddf4c00464c6fee998d56da1f08b4662abf62':
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 11:59:37 -08:00
Brett Chabot
851c913b6e am f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-mr2

* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
  Update adt-tests build.properties to include new test data location.
2009-11-09 11:57:18 -08:00
Brett Chabot
f765a70ac7 Update adt-tests build.properties to include new test data location.
Missed this file in the 31885 commit.
2009-11-08 13:46:35 -08:00
Android (Google) Code Review
8ccddf4c00 Merge change Id49751eb into eclair-sdk
* changes:
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-08 13:34:15 -08:00
Brett Chabot
c35d965427 am e458201d: am 534b520e: Merge change If5b2f9df into eclair
Merge commit 'e458201d1ab45d9b72027d3d319d16810bf0b94f' into eclair-mr2-plus-aosp

* commit 'e458201d1ab45d9b72027d3d319d16810bf0b94f':
  Fix ADT test data references.
2009-11-07 12:59:10 -08:00
Brett Chabot
e458201d1a am 534b520e: Merge change If5b2f9df into eclair
Merge commit '534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-mr2

* commit '534b520e4add964f75cf6a8a612b54916d46da2e':
  Fix ADT test data references.
2009-11-07 12:49:46 -08:00
Android (Google) Code Review
534b520e4a Merge change If5b2f9df into eclair
* changes:
  Fix ADT test data references.
2009-11-07 15:40:26 -05:00
Raphael
28f6fda581 SDK Manager: reuse complete downloads, retry Windows locks.
This resolves 2 main issues with the SDK updater:
- Completed downloads are not cleared till the install is successful
- They are also stored in SDK/temp rather than the real Windows TEMP
  folder, making them more discoverable for savvy users.
- There's a retry loop on failed install when due to a directory
  being locked.
- The retry loop comes with the a Big Fat Warning[tm] in a modal
  dialog box. You can't miss it. And it explicitly mentions the
  antivirus software can be the root cause.

SDK BUG 2235058

Change-Id: Id49751ebd67e7291a0e7005136b22576335729c1
2009-11-06 19:04:28 -08:00
Raphael
d80d98a559 am a4ebc122: am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6' into eclair-mr2-plus-aosp

* commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:51:10 -08:00
Raphael
a4ebc12213 am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-mr2

* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:42:10 -08:00
Raphael
3de259034c am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair

* commit '8e3442f1b0fc19c8213978d4e7ac005774462297':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:13:41 -08:00
Android (Google) Code Review
8e3442f1b0 Merge change Ic291d534 into eclair-sdk
* changes:
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 19:06:48 -05:00
Raphael
3e9f34498a SDK Manager: refresh sources when HTTP/S pref is changed.
Currently you need to use the Refresh button in the remote page
after you change the HTTP/s setting and many users think
instead they need to close/restart the SDK manager.

Change-Id: Ic291d53459624558910bbc417295df5ddc7b037d
2009-11-06 15:18:57 -08:00
Raphael
86df89cf62 am 2d2d3408: am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '2d2d34086516a36e8d26f927c75b9944fd07b69f' into eclair-mr2-plus-aosp

* commit '2d2d34086516a36e8d26f927c75b9944fd07b69f':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:18:37 -08:00
Raphael
2d2d340865 am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-mr2

* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:08:28 -08:00
Raphael
bf9a70fb1b am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair

* commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:00:55 -08:00
Raphael
ca4603db2f SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d
2009-11-06 13:42:28 -08:00
Xavier Ducrohet
01262b3ae7 am f0f501ec: am 396a10e4: Merge change I793a35a9 into eclair
Merge commit 'f0f501ec27a4b37bf06288de808bc083d251921a' into eclair-mr2-plus-aosp

* commit 'f0f501ec27a4b37bf06288de808bc083d251921a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:24:31 -08:00
Xavier Ducrohet
f0f501ec27 am 396a10e4: Merge change I793a35a9 into eclair
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2

* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:15:38 -08:00
Android (Google) Code Review
396a10e48d Merge change I793a35a9 into eclair
* changes:
  ADT now launches app as if launched from launcher.
2009-11-06 14:08:24 -05:00
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
886119f56d am e9373a42: am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit 'e9373a42114a9ed37dbdc68991250bd40f54552f' into eclair-mr2-plus-aosp

* commit 'e9373a42114a9ed37dbdc68991250bd40f54552f':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:36:18 -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
mike ritter
3fb2d576e9 am c0446aa9: Merge change I4d2a57bc into eclair-mr2
Merge commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp

* commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9':
  Moved values into attributes of xml elements where they belong
2009-11-05 13:58:42 -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
Raphael
3d18353bac am 0136501f: am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp

* commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:35:39 -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