Commit Graph

1341 Commits

Author SHA1 Message Date
Raphael
a7e4208597 am 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair
Merge commit '6ae0010c61ed927ad715de4a75e140c932e1d86a' into eclair-mr2-plus-aosp

* commit '6ae0010c61ed927ad715de4a75e140c932e1d86a':
  SDK Manager: XML Schema for sdk-repository v2
2009-11-16 20:00:32 -08:00
Raphael
6ae0010c61 am 20d03274: Merge change I6809bd44 into eclair
Merge commit '20d0327492490b676a0a1036754e7742fb92bb69' into eclair-mr2

* commit '20d0327492490b676a0a1036754e7742fb92bb69':
  SDK Manager: XML Schema for sdk-repository v2
2009-11-16 19:56:59 -08:00
Raphael
2db89e8fe9 SDK Manager: XML Schema for sdk-repository v2
v2 will be a full standalone schema, not reusing any parts of v1.
Each package type is now defined using a named type, which means
a v3 version would redifine the top element and could include
some named types of v2.

Unfortunately we cannot *extend* the top element from v1 because
extension in XML Schema seems to imply a sequence (i.e. fixed order)
whereas we use a "choice" mode to have 0..N of each types in any
order.

SDK BUG 2252825

Change-Id: I6809bd4486ef2d7f2473995ed5a0abb7fa377bdd
2009-11-16 18:05:10 -08:00
Raphael
7371e18475 am 12ed1a7d: am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.
Merge commit '12ed1a7d9a72fa16cb677027e1cea65206550a22' into eclair-mr2-plus-aosp

* commit '12ed1a7d9a72fa16cb677027e1cea65206550a22':
  SDK Manager support for future schemas.
2009-11-16 14:44:58 -08:00
Raphael
f78995a8ee am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
Merge commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9' into eclair-mr2-plus-aosp

* commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9':
  SDK Manager: phase 1 of support for future schemas
2009-11-16 14:41:03 -08:00
Xavier Ducrohet
a48826a4a6 am 8b633873: am 5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b' into eclair-mr2-plus-aosp

* commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b':
  Rename the layout device from ION to ADP2.
2009-11-16 14:40:00 -08:00
Raphael
12ed1a7d9a am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.
Merge commit '5df7d75e1c9cc73b4fe0111f89f099e8dba3486b' into eclair-mr2

* commit '5df7d75e1c9cc73b4fe0111f89f099e8dba3486b':
  SDK Manager support for future schemas.
2009-11-16 14:29:40 -08:00
Raphael
5df7d75e1c am f4c63fae: SDK Manager support for future schemas.
Merge commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8' into eclair

* commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8':
  SDK Manager support for future schemas.
2009-11-16 14:25:49 -08:00
Raphael
f4c63fae0c SDK Manager support for future schemas.
This CL cleans up the v2 test by removing all v2 stuff
from the code right now. We only keep the part that
handles future schemas and right now the latest version is 1.

Change-Id: I31e6aeaf0582e94c67e1cc8317bec479ea7a52e7
2009-11-16 13:59:03 -08:00
Raphael
eeef441637 am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
Merge commit '6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-mr2

* commit '6dcf42149b183e2a2a062c90d60a2803cf01523a':
  SDK Manager: phase 1 of support for future schemas
2009-11-16 13:18:41 -08:00
Raphael
6dcf42149b resolved conflicts for merge of 0da4f158 to eclair
Fixes a merge eclair-sdk => eclair conflict of
  SDK Manager: phase 1 of support for future schemas
  SDK BUG 2252825

Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8
2009-11-16 13:07:43 -08:00
Android (Google) Code Review
0da4f158f9 Merge change If1bda264 into eclair-sdk
* changes:
  SDK Manager: phase 1 of support for future schemas
2009-11-16 12:53:09 -08:00
Raphael
580e982719 SDK Manager: phase 1 of support for future schemas
This is phase 1 of the support for future schemas:
- introduces a new v2 of the XSD
- handles an unknown XSD and extract its tools elements after
  some hand checks.

TODO in phase 2:
- we still need to iron out the details of the sample node.
- there's no support for samples yet... this commit is not
  about switching the sample code support to the new structure.
- there's no indication to the user that we are handling a new
  schema... there should be some visual clue on why only the
  tools are shown.

SDK BUG 2252825

Change-Id: If1bda26414cfe15275063d3187a98be6301d2992
2009-11-16 11:42:28 -08:00
Xavier Ducrohet
8b6338739b am 5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '5f9e0abed17ab1197a0868729232cb2c2024cef2' into eclair-mr2

* commit '5f9e0abed17ab1197a0868729232cb2c2024cef2':
  Rename the layout device from ION to ADP2.
2009-11-16 11:32:34 -08:00
Xavier Ducrohet
b624370d79 Rename the layout device from ION to ADP2. (do not merge)
This is integrated from Eclair.
2009-11-16 11:29:29 -08:00
Android (Google) Code Review
5f9e0abed1 Merge change I5a66bbdf into eclair
* changes:
  Rename the layout device from ION to ADP2.
2009-11-16 11:21:10 -08:00
Xavier Ducrohet
92bc35cc44 Rename the layout device from ION to ADP2.
Change-Id: I5a66bbdf68772504cac2379ea85edb88c77f2fde
2009-11-15 17:02:26 -08:00
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