OSDN Git Service
Bjorn Bringert [Mon, 9 Nov 2009 19:57:37 +0000 (11:57 -0800)]
am
f702fa41: Merge change I53c8228b into eclair
Merge commit '
f702fa413273d175ba499bcb9bd352d208621d95' into eclair-mr2
* commit '
f702fa413273d175ba499bcb9bd352d208621d95':
Fix type of _id col in SearchableDictionary
Xavier Ducrohet [Mon, 9 Nov 2009 19:57:33 +0000 (11:57 -0800)]
am
7e56f226: Merge change I68a71c11 into eclair
Merge commit '
7e56f226f745c2397b2cec4d0da1f61276e1b150' into eclair-mr2
* commit '
7e56f226f745c2397b2cec4d0da1f61276e1b150':
Add Japanese font to SDK.
Brett Chabot [Mon, 9 Nov 2009 19:57:18 +0000 (11:57 -0800)]
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.
Android (Google) Code Review [Mon, 9 Nov 2009 16:58:40 +0000 (08:58 -0800)]
Merge change I53c8228b into eclair
* changes:
Fix type of _id col in SearchableDictionary
Android (Google) Code Review [Mon, 9 Nov 2009 01:02:05 +0000 (17:02 -0800)]
Merge change I68a71c11 into eclair
* changes:
Add Japanese font to SDK.
Xavier Ducrohet [Sun, 8 Nov 2009 23:15:37 +0000 (15:15 -0800)]
Add Japanese font to SDK.
BUG
2041229
Change-Id: I68a71c11ae4f61c987a888dadf205f585b577c61
Brett Chabot [Sun, 8 Nov 2009 21:46:35 +0000 (13:46 -0800)]
Update adt-tests build.properties to include new test data location.
Missed this file in the 31885 commit.
Brett Chabot [Sat, 7 Nov 2009 20:49:46 +0000 (12:49 -0800)]
am
534b520e: Merge change If5b2f9df into eclair
Merge commit '
534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-mr2
* commit '
534b520e4add964f75cf6a8a612b54916d46da2e':
Fix ADT test data references.
Android (Google) Code Review [Sat, 7 Nov 2009 20:40:26 +0000 (15:40 -0500)]
Merge change If5b2f9df into eclair
* changes:
Fix ADT test data references.
Raphael [Sat, 7 Nov 2009 00:42:10 +0000 (16:42 -0800)]
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.
Raphael [Sat, 7 Nov 2009 00:13:41 +0000 (16:13 -0800)]
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.
Android (Google) Code Review [Sat, 7 Nov 2009 00:06:48 +0000 (19:06 -0500)]
Merge change Ic291d534 into eclair-sdk
* changes:
SDK Manager: refresh sources when HTTP/S pref is changed.
Raphael [Fri, 6 Nov 2009 23:18:57 +0000 (15:18 -0800)]
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
Raphael [Fri, 6 Nov 2009 22:08:28 +0000 (14:08 -0800)]
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.
Raphael [Fri, 6 Nov 2009 22:00:55 +0000 (14:00 -0800)]
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.
Raphael [Fri, 6 Nov 2009 21:42:28 +0000 (13:42 -0800)]
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d
Xavier Ducrohet [Fri, 6 Nov 2009 19:15:38 +0000 (11:15 -0800)]
am
396a10e4: Merge change I793a35a9 into eclair
Merge commit '
396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2
* commit '
396a10e48d7201215e54821fa0d7901ffde3a30a':
ADT now launches app as if launched from launcher.
Android (Google) Code Review [Fri, 6 Nov 2009 19:08:24 +0000 (14:08 -0500)]
Merge change I793a35a9 into eclair
* changes:
ADT now launches app as if launched from launcher.
Xavier Ducrohet [Fri, 6 Nov 2009 02:38:04 +0000 (18:38 -0800)]
ADT now launches app as if launched from launcher.
BUG
2243142
Change-Id: I793a35a92cf0f818242e74e4794d74a681b25d83
Xavier Ducrohet [Fri, 6 Nov 2009 18:26:37 +0000 (10:26 -0800)]
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
Android (Google) Code Review [Fri, 6 Nov 2009 18:15:45 +0000 (13:15 -0500)]
Merge change I1fa1ae88 into eclair
* changes:
Move Tools to rev 5, and ADT to 0.9.5
Xavier Ducrohet [Fri, 6 Nov 2009 18:05:53 +0000 (10:05 -0800)]
Move Tools to rev 5, and ADT to 0.9.5
Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445
Fred Quintana [Thu, 5 Nov 2009 21:53:36 +0000 (13:53 -0800)]
am
b5723869: Merge change I85aa2b1d into eclair
Merge commit '
b57238690e7e4afa66416e3ad25183a576f35075' into eclair-mr2
* commit '
b57238690e7e4afa66416e3ad25183a576f35075':
create a test app that allows direct control of a sync adapter for testing purposes
Android (Google) Code Review [Thu, 5 Nov 2009 21:50:10 +0000 (16:50 -0500)]
Merge change I4d2a57bc into eclair-mr2
* changes:
Moved values into attributes of xml elements where they belong
Android (Google) Code Review [Thu, 5 Nov 2009 19:16:08 +0000 (14:16 -0500)]
Merge change I85aa2b1d into eclair
* changes:
create a test app that allows direct control of a sync adapter for testing purposes
Fred Quintana [Wed, 4 Nov 2009 01:18:33 +0000 (17:18 -0800)]
create a test app that allows direct control of a sync adapter for testing purposes
http://b/issue?id=
2239791
Xavier Ducrohet [Wed, 4 Nov 2009 23:15:19 +0000 (15:15 -0800)]
am
421e8d33: (-s ours) am
7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '
421e8d3353de606444e5350d8feeee8c01c90394' into eclair-mr2
* commit '
421e8d3353de606444e5350d8feeee8c01c90394':
Ignore hidden files and vi swap files during packaging. (do not merge)
Xavier Ducrohet [Wed, 4 Nov 2009 23:05:34 +0000 (15:05 -0800)]
am
7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '
7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair
* commit '
7f305ce77069cf8432374f12392a3ce3a476bdce':
Ignore hidden files and vi swap files during packaging. (do not merge)
Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]
Ignore hidden files and vi swap files during packaging. (do not merge)
BUG #
2233458
This is integrated from eclair.
Bjorn Bringert [Tue, 3 Nov 2009 15:37:36 +0000 (15:37 +0000)]
Fix type of _id col in SearchableDictionary
SDK SAMPLE CODE ONLY
Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.
Fixes http://b/issue?id=
2219970
Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
Eric Rowe [Wed, 4 Nov 2009 02:24:47 +0000 (18:24 -0800)]
Fix bug where monkey always tries to run multiple scripts.
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
Brett Chabot [Tue, 3 Nov 2009 20:29:42 +0000 (12:29 -0800)]
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.
Raphael [Tue, 3 Nov 2009 20:25:07 +0000 (12:25 -0800)]
am
03684b9d: am
4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '
03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-mr2
* commit '
03684b9d88cfa8f9775685d7a4efed2c96a57932':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Raphael [Tue, 3 Nov 2009 20:17:52 +0000 (12:17 -0800)]
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
Android (Google) Code Review [Tue, 3 Nov 2009 19:45:53 +0000 (14:45 -0500)]
Merge change I01b36924 into eclair-mr2
* changes:
click OK to toggle between demos
Mike Reed [Tue, 3 Nov 2009 19:44:25 +0000 (11:44 -0800)]
click OK to toggle between demos
Xavier Ducrohet [Tue, 3 Nov 2009 19:34:02 +0000 (11:34 -0800)]
am
f9e0b264: Move check for hidden files in the proper method.
Merge commit '
f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-mr2
* commit '
f9e0b264422d086066a9d9deb2118617735e8d65':
Move check for hidden files in the proper method.
Xavier Ducrohet [Tue, 3 Nov 2009 18:52:54 +0000 (10:52 -0800)]
Move check for hidden files in the proper method.
Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148
Raphael [Tue, 3 Nov 2009 17:53:32 +0000 (09:53 -0800)]
am
8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '
8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-mr2
* commit '
8d700bdf67681ad405819c06906325768f8cf9ea':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Raphael [Tue, 3 Nov 2009 17:40:55 +0000 (09:40 -0800)]
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG
2233458
Xavier Ducrohet [Tue, 3 Nov 2009 07:16:41 +0000 (23:16 -0800)]
am
f31f6303: Merge change If0d0751e into eclair
Merge commit '
f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2
* commit '
f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.
Android (Google) Code Review [Tue, 3 Nov 2009 07:06:32 +0000 (02:06 -0500)]
Merge change If0d0751e into eclair
* changes:
Ignore hidden files and vi swap files during packaging.
Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]
Ignore hidden files and vi swap files during packaging.
BUG #
2233458
Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
Brett Chabot [Tue, 3 Nov 2009 01:14:46 +0000 (17:14 -0800)]
am
a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit '
a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-mr2
* commit '
a9982898b33399ddeee1e97f5f0d18c77ec1d538':
Remove calendar provider suite from continuous. DO NOT MERGE
Android (Google) Code Review [Tue, 3 Nov 2009 01:08:06 +0000 (20:08 -0500)]
Merge change Ida443c07 into eclair
* changes:
Remove calendar provider suite from continuous. DO NOT MERGE
Raphael [Mon, 2 Nov 2009 22:54:29 +0000 (14:54 -0800)]
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
SDK BUG
2232091
Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5
Android (Google) Code Review [Mon, 2 Nov 2009 22:31:49 +0000 (17:31 -0500)]
Merge change I20a74d79 into eclair-mr2
* changes:
Create way to run monkey with multiple scripts.
Xavier Ducrohet [Mon, 2 Nov 2009 20:45:31 +0000 (12:45 -0800)]
am
208c7569: (-s ours) am
0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '
208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-mr2
* commit '
208c75697e483f63f6075f28c1fc4ff49382f884':
Only apply permission to files with +x (do not merge)
Xavier Ducrohet [Mon, 2 Nov 2009 20:34:39 +0000 (12:34 -0800)]
am
0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair
* commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92':
Only apply permission to files with +x (do not merge)
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x (do not merge)
integrated from eclair branch.
Xavier Ducrohet [Mon, 2 Nov 2009 19:48:45 +0000 (11:48 -0800)]
am
192d5db1: Merge change Ied3304a0 into eclair
Merge commit '
192d5db1fedef99404644256f80740bb3763b049' into eclair-mr2
* commit '
192d5db1fedef99404644256f80740bb3763b049':
Only apply permission to files with +x
Android (Google) Code Review [Mon, 2 Nov 2009 19:40:10 +0000 (14:40 -0500)]
Merge change Ied3304a0 into eclair
* changes:
Only apply permission to files with +x
Brett Chabot [Sat, 31 Oct 2009 00:20:49 +0000 (17:20 -0700)]
Remove calendar provider suite from continuous. DO NOT MERGE
Bug
2171501
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
Raphael [Fri, 30 Oct 2009 20:08:23 +0000 (13:08 -0700)]
am
8a370089: am
d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '
8a370089b824f5acd97b5986b9b1e5bff3aefca4' into eclair-mr2
* commit '
8a370089b824f5acd97b5986b9b1e5bff3aefca4':
SDK Manager: Display error when saving settings
Raphael [Fri, 30 Oct 2009 20:01:22 +0000 (13:01 -0700)]
am
d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair
* commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de':
SDK Manager: Display error when saving settings
Raphael [Fri, 30 Oct 2009 04:20:41 +0000 (21:20 -0700)]
SDK Manager: Display error when saving settings
SDK BUG
2226029
Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
Dmitri Plotnikov [Fri, 30 Oct 2009 02:32:52 +0000 (19:32 -0700)]
am
41c271bb: Merge change Iae0bc856 into eclair
Merge commit '
41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-mr2
* commit '
41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
Raphael [Fri, 30 Oct 2009 02:32:40 +0000 (19:32 -0700)]
am
7a42c8f4: am
be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit '
7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae' into eclair-mr2
* commit '
7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
Brett Chabot [Fri, 30 Oct 2009 02:32:34 +0000 (19:32 -0700)]
am
da78534e: Merge change Ia94518e3 into eclair
Merge commit '
da78534e3aefa41c7b76f6570cfcd7cea296325c' into eclair-mr2
* commit '
da78534e3aefa41c7b76f6570cfcd7cea296325c':
ADT test fixes.
Raphael [Fri, 30 Oct 2009 02:31:07 +0000 (19:31 -0700)]
am
aad90b62: (-s ours) am
940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit '
aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-mr2
* commit '
aad90b62c73e6d44ed391fb24953021d0b45a768':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Raphael [Fri, 30 Oct 2009 02:31:01 +0000 (19:31 -0700)]
am
1a29f28e: (-s ours) am
dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit '
1a29f28e13c32fd8e62f08677c23d1d37644dd43' into eclair-mr2
* commit '
1a29f28e13c32fd8e62f08677c23d1d37644dd43':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Xavier Ducrohet [Fri, 30 Oct 2009 02:30:19 +0000 (19:30 -0700)]
am
8d7fa52a: am
3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit '
8d7fa52af11670e2640b12466cc094960f0455b1' into eclair-mr2
* commit '
8d7fa52af11670e2640b12466cc094960f0455b1':
Move SDK tools package to r4
Xavier Ducrohet [Fri, 30 Oct 2009 02:29:38 +0000 (19:29 -0700)]
am
f7f145dc: am
275de810: Merge change I2089d86d into eclair-sdk
Merge commit '
f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-mr2
* commit '
f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
Android (Google) Code Review [Thu, 29 Oct 2009 21:49:26 +0000 (17:49 -0400)]
Merge change Iae0bc856 into eclair
* changes:
A sample application that demonstrates use of legacy and current contacts APIs.
Raphael [Thu, 29 Oct 2009 21:31:05 +0000 (14:31 -0700)]
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.
Dmitri Plotnikov [Thu, 29 Oct 2009 01:36:32 +0000 (18:36 -0700)]
A sample application that demonstrates use of legacy and current contacts APIs.
The application provides two implementations for access to contacts, one based
on legacy API, the other based on the current API. The correct implementation
is chosen at runtime based on the version of the SDK.
Change-Id: Iae0bc8564be420ff504a5dc760b935630a7664e6
Raphael [Thu, 29 Oct 2009 20:52:56 +0000 (13:52 -0700)]
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
Android (Google) Code Review [Thu, 29 Oct 2009 20:45:53 +0000 (16:45 -0400)]
Merge change Ia94518e3 into eclair
* changes:
ADT test fixes.
Raphael [Thu, 29 Oct 2009 20:30:46 +0000 (13:30 -0700)]
am
940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit '
940073e267695a7c4a404cb2174b48e893c15a45' into eclair
* commit '
940073e267695a7c4a404cb2174b48e893c15a45':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Raphael [Thu, 29 Oct 2009 20:30:39 +0000 (13:30 -0700)]
am
dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit '
dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e' into eclair
* commit '
dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Android (Google) Code Review [Thu, 29 Oct 2009 20:22:26 +0000 (16:22 -0400)]
Merge change I28aa1104 into eclair-sdk
* changes:
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Android (Google) Code Review [Thu, 29 Oct 2009 20:14:35 +0000 (16:14 -0400)]
Merge change I6b97fee0 into eclair-sdk
* changes:
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Xavier Ducrohet [Thu, 29 Oct 2009 20:09:24 +0000 (13:09 -0700)]
am
3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit '
3c5557bb5e9235737c4c7ddda4c66f14396105cf' into eclair
* commit '
3c5557bb5e9235737c4c7ddda4c66f14396105cf':
Move SDK tools package to r4
Android (Google) Code Review [Thu, 29 Oct 2009 20:00:32 +0000 (16:00 -0400)]
Merge change Idd4c6e5f into eclair-sdk
* changes:
Move SDK tools package to r4
Raphael [Thu, 29 Oct 2009 20:00:11 +0000 (13:00 -0700)]
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
Raphael [Thu, 29 Oct 2009 19:56:16 +0000 (12:56 -0700)]
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
Xavier Ducrohet [Thu, 29 Oct 2009 19:39:03 +0000 (12:39 -0700)]
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
Android (Google) Code Review [Thu, 29 Oct 2009 19:31:48 +0000 (15:31 -0400)]
Merge change Ia8fe3f64 into eclair-mr2
* changes:
add graphicslab test app
Mike Reed [Thu, 29 Oct 2009 19:31:08 +0000 (15:31 -0400)]
add graphicslab test app
Android (Google) Code Review [Thu, 29 Oct 2009 19:28:07 +0000 (15:28 -0400)]
Merge change I2089d86d into eclair-sdk
* changes:
Fix the android launcher script to not force Java 1.5 on MacOS
Xavier Ducrohet [Thu, 29 Oct 2009 19:27:50 +0000 (12:27 -0700)]
Move SDK tools package to r4
Xavier Ducrohet [Thu, 29 Oct 2009 18:40:20 +0000 (11:40 -0700)]
Fix the android launcher script to not force Java 1.5 on MacOS
Raphael [Thu, 29 Oct 2009 08:25:39 +0000 (01:25 -0700)]
am
107b1a9e: Merge change Ie496edfa into eclair
Merge commit '
107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-mr2
* commit '
107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
SDK Updater: don't load sdk-repo XML that failed to validate.
Raphael [Thu, 29 Oct 2009 08:24:55 +0000 (01:24 -0700)]
am
09c5201a: Prepare version numbers for next SDK & tools
Merge commit '
09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-mr2
* commit '
09c5201adca0ceb0e881832d53cfa9e412d07389':
Prepare version numbers for next SDK & tools
Brett Chabot [Thu, 29 Oct 2009 01:22:15 +0000 (18:22 -0700)]
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
Eric Rowe [Wed, 28 Oct 2009 22:25:45 +0000 (15:25 -0700)]
Create way to run monkey with multiple scripts.
By giving multiple -f arguments, the monkey will randomly choose between the
scripts. Also, add the --setup argument which will run a setup script before
starting to play the other scripts in random order.
Mike Reed [Wed, 28 Oct 2009 21:04:38 +0000 (17:04 -0400)]
Revert "update demo to use boundary patch"
This reverts commit
3f14f59ee679c76438f6d37bfc9535b4bc2be024.
Mike Reed [Wed, 28 Oct 2009 19:38:47 +0000 (15:38 -0400)]
update demo to use boundary patch
Brett Chabot [Wed, 28 Oct 2009 18:36:51 +0000 (11:36 -0700)]
am
0c62341e: Merge change I3778cb73 into eclair
Merge commit '
0c62341e8ec194a18bbf35fb380287c15d2da70d' into eclair-mr2
* commit '
0c62341e8ec194a18bbf35fb380287c15d2da70d':
Fix runcommand logging exception.
Raphael [Wed, 28 Oct 2009 18:35:39 +0000 (11:35 -0700)]
am
b3bca018: Merge change I337b2644 into eclair
Merge commit '
b3bca018783a0621b981ec8eb98dbbd15f450677' into eclair-mr2
* commit '
b3bca018783a0621b981ec8eb98dbbd15f450677':
SDK Manager > AVD > Start: print computed scale.
Xavier Ducrohet [Wed, 28 Oct 2009 17:29:06 +0000 (10:29 -0700)]
am
a73e4f9a: Merge change I7f60270f into eclair
Merge commit '
a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-mr2
* commit '
a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Brett Chabot [Wed, 28 Oct 2009 17:28:49 +0000 (10:28 -0700)]
am
3777f090: Merge change I25e7415f into eclair
Merge commit '
3777f090a3a187bc251705028fe8cb019400e330' into eclair-mr2
* commit '
3777f090a3a187bc251705028fe8cb019400e330':
Add runtest --path.
Android (Google) Code Review [Wed, 28 Oct 2009 00:57:02 +0000 (20:57 -0400)]
Merge change Ie496edfa into eclair
* changes:
SDK Updater: don't load sdk-repo XML that failed to validate.
Raphael [Tue, 27 Oct 2009 22:28:34 +0000 (15:28 -0700)]
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
Raphael [Tue, 27 Oct 2009 22:33:17 +0000 (15:33 -0700)]
Prepare version numbers for next SDK & tools
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
Android (Google) Code Review [Tue, 27 Oct 2009 00:55:49 +0000 (20:55 -0400)]
Merge change I3778cb73 into eclair
* changes:
Fix runcommand logging exception.
Brett Chabot [Mon, 26 Oct 2009 21:51:45 +0000 (14:51 -0700)]
Fix runcommand logging exception.
BUG
2215978
Android (Google) Code Review [Mon, 26 Oct 2009 23:12:43 +0000 (19:12 -0400)]
Merge change I337b2644 into eclair
* changes:
SDK Manager > AVD > Start: print computed scale.
Android (Google) Code Review [Mon, 26 Oct 2009 21:16:46 +0000 (17:16 -0400)]
Merge change I7f60270f into eclair
* changes:
ADT/GEL: Reenable config popup when switching from a device with only 1 config
OSDN Git Service
