Commit Graph

2523 Commits

Author SHA1 Message Date
David 'Digit' Turner
888c76db93 am 6e8cfcec: am 6f605c32: Merge change If7aa22af into eclair
Merge commit '6e8cfcece99260eb2ce539797551153d72b6ca29' into eclair-mr2-plus-aosp

* commit '6e8cfcece99260eb2ce539797551153d72b6ca29':
  Remove bash-ism from build-ndk-sysroot.sh
2009-10-22 06:51:50 -07:00
David 'Digit' Turner
e5309ad850 am 1c962f87: am fb766f44: Merge change I898b43fe into eclair
Merge commit '1c962f8758bb7e80639da221788f571dddcc8b02' into eclair-mr2-plus-aosp

* commit '1c962f8758bb7e80639da221788f571dddcc8b02':
  Refresh NDK C library headers for all platforms
2009-10-22 06:51:46 -07:00
Raphael
3c2e880a79 am 66d13f19: am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '66d13f192b50aef39272da5330d4484de7d68ca4' into eclair-mr2-plus-aosp

* commit '66d13f192b50aef39272da5330d4484de7d68ca4':
  SDK Updater: UI polish
2009-10-22 06:51:42 -07:00
Raphael
377912f3f6 am 71ae9b3e: am d75c03e4: am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '71ae9b3e2f79a7fbfaf9283f75252988e1df5414' into eclair-mr2-plus-aosp

* commit '71ae9b3e2f79a7fbfaf9283f75252988e1df5414':
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-22 06:51:38 -07:00
David 'Digit' Turner
6e8cfcece9 am 6f605c32: Merge change If7aa22af into eclair
Merge commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a' into eclair-mr2

* commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a':
  Remove bash-ism from build-ndk-sysroot.sh
2009-10-22 06:38:55 -07:00
David 'Digit' Turner
1c962f8758 am fb766f44: Merge change I898b43fe into eclair
Merge commit 'fb766f44a71f7b97610065fd1628652026f69880' into eclair-mr2

* commit 'fb766f44a71f7b97610065fd1628652026f69880':
  Refresh NDK C library headers for all platforms
2009-10-22 06:38:38 -07:00
Raphael
66d13f192b am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99' into eclair-mr2

* commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99':
  SDK Updater: UI polish
2009-10-22 06:38:12 -07:00
Raphael
71ae9b3e2f am d75c03e4: am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe' into eclair-mr2

* commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe':
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-22 06:38:07 -07:00
Raphael
b62c420829 am d9d3891b: am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk
Merge commit 'd9d3891bf5f4922520783f2fbb1ff4ec61403ba0' into eclair-mr2-plus-aosp

* commit 'd9d3891bf5f4922520783f2fbb1ff4ec61403ba0':
  Fix potential NPE in manifest editor when switching SDKs
2009-10-21 22:31:00 -07:00
Raphael
736393ef2c am 17180783: am bf2cc38e: am 5708d157: Android.bat: remove /O in xcopy.
Merge commit '17180783e53f84d244e7c61d890039d9fa783443' into eclair-mr2-plus-aosp

* commit '17180783e53f84d244e7c61d890039d9fa783443':
  Android.bat: remove /O in xcopy.
2009-10-21 22:30:55 -07:00
Raphael
d9d3891bf5 am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '90b60a3985d07f6113d91737fcd37da2d282ce8f' into eclair-mr2

* commit '90b60a3985d07f6113d91737fcd37da2d282ce8f':
  Fix potential NPE in manifest editor when switching SDKs
2009-10-21 22:22:16 -07:00
Raphael
17180783e5 am bf2cc38e: am 5708d157: Android.bat: remove /O in xcopy.
Merge commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d' into eclair-mr2

* commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d':
  Android.bat: remove /O in xcopy.
2009-10-21 22:22:11 -07:00
Android (Google) Code Review
6f605c32ad Merge change If7aa22af into eclair
* changes:
  Remove bash-ism from build-ndk-sysroot.sh
2009-10-20 19:18:07 -04:00
Android (Google) Code Review
fb766f44a7 Merge change I898b43fe into eclair
* changes:
  Refresh NDK C library headers for all platforms
2009-10-20 18:53:24 -04:00
David 'Digit' Turner
f7aa22af3c Remove bash-ism from build-ndk-sysroot.sh 2009-10-20 15:33:40 -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
David 'Digit' Turner
898b43fedc Refresh NDK C library headers for all platforms 2009-10-20 15:25:40 -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
Raphael
bf2cc38e5b am 5708d157: Android.bat: remove /O in xcopy.
Merge commit '5708d1576b3e19601804ea7dfffdee3da6c0c00d' into eclair

* commit '5708d1576b3e19601804ea7dfffdee3da6c0c00d':
  Android.bat: remove /O in xcopy.
2009-10-20 13:19:54 -07:00
Android (Google) Code Review
c9b04450ef Merge change I4151529e into eclair-sdk
* changes:
  Fix potential NPE in manifest editor when switching SDKs
2009-10-20 16:13:50 -04:00
Raphael
4ed80aea34 Fix potential NPE in manifest editor when switching SDKs
The UiElementNode depends on the target to compute the
description and it's entirely possible for the target to
be null while the SDK is being unloaded/reloaded.

SDK BUG 2196260

Change-Id: I4151529ea3b6a65eade47d03e55fc93cad8596d9
2009-10-20 12:59:15 -07:00
Raphael
5708d1576b Android.bat: remove /O in xcopy.
It means "copy ownership". But on the Vista 64 box in the lab,
it make the xcopy of lib/x86/swt.jar fail the next time when it
was already present.

SDK BUG 2198636
2009-10-20 12:16:51 -07:00
Eric Rowe
7125a08318 am 20e7a15b: Modify Monkey so that scripts can use raw and user events.
Merge commit '20e7a15bb74d7349ee879bb311a0607325f49aaf' into eclair-mr2-plus-aosp

* commit '20e7a15bb74d7349ee879bb311a0607325f49aaf':
  Modify Monkey so that scripts can use raw and user events.
2009-10-20 11:50:50 -07:00
Eric Rowe
20e7a15bb7 Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java.  Also, fix bug where too few arguments in
the script causes a RuntimeException.
2009-10-20 10:38:56 -07:00
Xavier Ducrohet
8a87b652e6 am 0d439910: am 302e013b: am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '0d43991074e178c388b06b2f8984967c140451b9' into eclair-mr2-plus-aosp

* commit '0d43991074e178c388b06b2f8984967c140451b9':
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 14:58:36 -07:00
Xavier Ducrohet
0d43991074 am 302e013b: am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b' into eclair-mr2

* commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b':
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 14:46:00 -07:00
Xavier Ducrohet
302e013b6a am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913' into eclair

* commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913':
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 14:37:11 -07:00
Android (Google) Code Review
fc5b5aecde Merge change I1a00abb0 into eclair-sdk
* changes:
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 17:24:34 -04:00
Xavier Ducrohet
1a00abb0ae Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time. 2009-10-19 12:56:57 -07:00
Raphael
17c0f72c83 am 501d2ae5: am ea82bcc2: (-s ours) am 5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '501d2ae52d02db9676ab2fbc5452c38289ebd84c' into eclair-mr2-plus-aosp

* commit '501d2ae52d02db9676ab2fbc5452c38289ebd84c':
  SDK Updater: properly update/install doc. (do not merge)
2009-10-16 18:19:03 -07:00
Xavier Ducrohet
e0b0c2ccf1 am 1a63ee0b: am 15549af0: (-s ours) am af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad' into eclair-mr2-plus-aosp

* commit '1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad':
  Add save/load for the user-made Layout Devices. (do not merge)
2009-10-16 18:19:00 -07:00
Xavier Ducrohet
ef04e43fb5 am cad5cf2e: am 81747d72: (-s ours) am 5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit 'cad5cf2e9dffa8735435c3a046438028f1a1832a' into eclair-mr2-plus-aosp

* commit 'cad5cf2e9dffa8735435c3a046438028f1a1832a':
  WQVGA skin (240x400) (do not merge)
2009-10-16 18:18:56 -07:00
Raphael
f7b5b95217 am b1192a67: am 2a13cc20: SDK Updater: properly update/install doc.
Merge commit 'b1192a677c3b17dc51c0bfde07f8d7586bf8f4b6' into eclair-mr2-plus-aosp

* commit 'b1192a677c3b17dc51c0bfde07f8d7586bf8f4b6':
  SDK Updater: properly update/install doc.
2009-10-16 18:18:52 -07:00
Raphael
501d2ae52d am ea82bcc2: (-s ours) am 5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit 'ea82bcc20b12af0ba72a12d7e178be413b806bfb' into eclair-mr2

* commit 'ea82bcc20b12af0ba72a12d7e178be413b806bfb':
  SDK Updater: properly update/install doc. (do not merge)
2009-10-16 18:08:23 -07:00
Xavier Ducrohet
1a63ee0bbb am 15549af0: (-s ours) am af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '15549af01e6d1d62b56e825800191d223c4f29a2' into eclair-mr2

* commit '15549af01e6d1d62b56e825800191d223c4f29a2':
  Add save/load for the user-made Layout Devices. (do not merge)
2009-10-16 18:08:18 -07:00
Xavier Ducrohet
cad5cf2e9d am 81747d72: (-s ours) am 5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '81747d726994d027d64652a6f6ee59d76427df31' into eclair-mr2

* commit '81747d726994d027d64652a6f6ee59d76427df31':
  WQVGA skin (240x400) (do not merge)
2009-10-16 18:08:14 -07:00
Raphael
b1192a677c am 2a13cc20: SDK Updater: properly update/install doc.
Merge commit '2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60' into eclair-mr2

* commit '2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60':
  SDK Updater: properly update/install doc.
2009-10-16 18:08:10 -07:00
Raphael
ea82bcc20b am 5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '5cff81bb5878d00925cbab24822123f1feebbbb8' into eclair

* commit '5cff81bb5878d00925cbab24822123f1feebbbb8':
  SDK Updater: properly update/install doc. (do not merge)
2009-10-16 17:57:18 -07:00
Xavier Ducrohet
15549af01e am af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit 'af496633406c19192db960d822b51fa1f574fbf2' into eclair

* commit 'af496633406c19192db960d822b51fa1f574fbf2':
  Add save/load for the user-made Layout Devices. (do not merge)
2009-10-16 17:57:15 -07:00
Xavier Ducrohet
81747d7269 am 5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf' into eclair

* commit '5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf':
  WQVGA skin (240x400) (do not merge)
2009-10-16 17:57:10 -07:00
Raphael
5cff81bb58 SDK Updater: properly update/install doc. (do not merge)
This contains the following changes:
- a new interface IPackageVersion for all Package classes that can
  provide an AndroidVersion getVersion().
- fixes the "update sdk" where the local repo has no doc by suggesting
  to install the most up-to-date doc.
- fixes a bad cast in the UpdaterLogic.
- normalizes the long descriptions but adding the revision if not
  present.
- fixes an edge case when displaying the very long description of the
  docs package, i.e. need to indicate it is upgraded due to a version
  change.

SDK BUG 2192352
2009-10-16 17:50:37 -07:00
Xavier Ducrohet
af49663340 Add save/load for the user-made Layout Devices. (do not merge)
Also added support for mcc/mnc in the schema.
2009-10-16 17:49:45 -07:00
Xavier Ducrohet
5e4efac4f7 WQVGA skin (240x400) (do not merge) 2009-10-16 17:46:00 -07:00
Raphael
2a13cc201a SDK Updater: properly update/install doc.
This contains the following changes:
- a new interface IPackageVersion for all Package classes that can
  provide an AndroidVersion getVersion().
- fixes the "update sdk" where the local repo has no doc by suggesting
  to install the most up-to-date doc.
- fixes a bad cast in the UpdaterLogic.
- normalizes the long descriptions but adding the revision if not
  present.
- fixes an edge case when displaying the very long description of the
  docs package, i.e. need to indicate it is upgraded due to a version
  change.

SDK BUG 2192352

Change-Id: I87eda018b450ca9973e4f3b55caef964c0b31480
2009-10-15 16:56:56 -07:00
Raphael
7afd643ebd am 15ecb4b8: am 97eef6fd: Merge change Ifb00e723 into eclair
Merge commit '15ecb4b8b622a64ee88714b2872e844bb5a051ee' into eclair-mr2-plus-aosp

* commit '15ecb4b8b622a64ee88714b2872e844bb5a051ee':
  Actively remove the obsolete sdkuilib symlink.
2009-10-15 15:31:37 -07:00