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
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
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
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
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
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
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
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
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
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
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
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
c48867aab4
Move Tools to rev 5, and ADT to 0.9.5
...
Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445
2009-11-06 10:05:53 -08: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