Commit Graph

2446 Commits

Author SHA1 Message Date
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
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
15ecb4b8b6 am 97eef6fd: Merge change Ifb00e723 into eclair
Merge commit '97eef6fdf0a26287dc7161b68f0978a691c175bb' into eclair-mr2

* commit '97eef6fdf0a26287dc7161b68f0978a691c175bb':
  Actively remove the obsolete sdkuilib symlink.
2009-10-15 15:22:01 -07:00
Android (Google) Code Review
97eef6fdf0 Merge change Ifb00e723 into eclair
* changes:
  Actively remove the obsolete sdkuilib symlink.
2009-10-15 18:14:10 -04:00
Raphael
511537dcf3 Actively remove the obsolete sdkuilib symlink.
Some of the build servers still have the link and it
breaks continuous tests.

SDK BUG 2177557

Change-Id: Ifb00e7234c9c356c1ffd4aa1aff73f6761a655dc
2009-10-15 15:09:07 -07:00
David 'Digit' Turner
cbbcbd3742 am ddf1ac3e: Merge change I1db4662e into eclair
Merge commit 'ddf1ac3efd863a203e449fb60a3d40f792377709' into eclair-mr2

* commit 'ddf1ac3efd863a203e449fb60a3d40f792377709':
  Remove bash-ism from build-toolchain.sh
2009-10-15 14:19:24 -07:00
Xavier Ducrohet
c7774433dd am bc3c3394: Merge change I8a2d2379 into eclair
Merge commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e' into eclair-mr2

* commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e':
  Add save/load for the user-made Layout Devices.
2009-10-15 14:19:19 -07:00
Android (Google) Code Review
ddf1ac3efd Merge change I1db4662e into eclair
* changes:
  Remove bash-ism from build-toolchain.sh
2009-10-15 17:08:32 -04:00
David 'Digit' Turner
1db4662e79 Remove bash-ism from build-toolchain.sh 2009-10-15 13:29:06 -07:00
Android (Google) Code Review
bc3c3394fb Merge change I8a2d2379 into eclair
* changes:
  Add save/load for the user-made Layout Devices.
2009-10-15 16:18:31 -04:00
Xavier Ducrohet
7e377d385c am cade0d0b: Merge change Icb3327e2 into eclair
Merge commit 'cade0d0b175b7de6921cffdbcb596778a282e56f' into eclair-mr2

* commit 'cade0d0b175b7de6921cffdbcb596778a282e56f':
  WQVGA skin (240x400)
2009-10-15 13:11:41 -07:00
Xavier Ducrohet
ba9c8dcdf0 Add save/load for the user-made Layout Devices.
Also added support for mcc/mnc in the schema.

Change-Id: I8a2d23797ec57eec69dc1d7218b01cd679634068
2009-10-15 13:06:35 -07:00
Android (Google) Code Review
cade0d0b17 Merge change Icb3327e2 into eclair
* changes:
  WQVGA skin (240x400)
2009-10-15 16:05:33 -04:00
Xavier Ducrohet
73ad4a8a49 WQVGA skin (240x400)
Change-Id: Icb3327e2371800029844a869df6abd68a8516aff
2009-10-15 11:10:03 -07:00
Dianne Hackborn
862eadb622 am a8baf9bc: Merge change Ie7eb359a into eclair
Merge commit 'a8baf9bcc8d9776e9aba35207af17723f7226027' into eclair-mr2

* commit 'a8baf9bcc8d9776e9aba35207af17723f7226027':
  Tweaks to Pointer Location.
2009-10-14 18:21:28 -07:00
Android (Google) Code Review
a8baf9bcc8 Merge change Ie7eb359a into eclair
* changes:
  Tweaks to Pointer Location.
2009-10-14 21:14:36 -04:00
Dianne Hackborn
9b528c143a Tweaks to Pointer Location.
Have it show the amount of total movement after a release, and whether this
is above the touch slop.

Change-Id: Ie7eb359a84e20786779015c3146ea5d96f380188
2009-10-14 16:30:09 -07:00
Xavier Ducrohet
82bb67e555 am 8dd4e92c: Merge change I74fdf8c6 into eclair
Merge commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789' into eclair-mr2

* commit '8dd4e92cc6838b811b7e8b81cb87bb1533bbf789':
  Fix device dpi handling in the Layout device parsing/UI.
2009-10-14 16:06:26 -07:00
David 'Digit' Turner
f9aa7764aa am 7fe9c714: Merge change I3986492c into eclair
Merge commit '7fe9c71413aad609b32fd433278ee1d9db673b2e' into eclair-mr2

* commit '7fe9c71413aad609b32fd433278ee1d9db673b2e':
  Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
2009-10-14 16:06:21 -07:00
Android (Google) Code Review
8dd4e92cc6 Merge change I74fdf8c6 into eclair
* changes:
  Fix device dpi handling in the Layout device parsing/UI.
2009-10-14 18:58:02 -04:00
Android (Google) Code Review
7fe9c71413 Merge change I3986492c into eclair
* changes:
  Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
2009-10-14 18:57:32 -04:00
David 'Digit' Turner
854f820c24 Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
This is used to help people easily package experimental versions of the NDK to
test and distribute fixes and improvements. The main idea is to allow external
contributors to play with it in interesting way and share the result easily.
2009-10-14 15:39:58 -07:00
Xavier Ducrohet
3cfed4b8c4 Fix device dpi handling in the Layout device parsing/UI.
Change-Id: I74fdf8c62a7b005e40e1817d9f39c59d8f99c070
2009-10-14 15:25:15 -07:00
Raphael
5bb5b9ae1e am 135ae886: Merge change Idad5a0ab into eclair
Merge commit '135ae88641599194c398cd5dbcee535313921f7a' into eclair-mr2

* commit '135ae88641599194c398cd5dbcee535313921f7a':
  SDK: Remove STOPSHIP keyword.
2009-10-14 12:27:12 -07:00
Android (Google) Code Review
135ae88641 Merge change Idad5a0ab into eclair
* changes:
  SDK: Remove STOPSHIP keyword.
2009-10-14 15:16:28 -04:00
Raphael
44098d157c SDK: Remove STOPSHIP keyword.
Change-Id: Idad5a0ab0f31c3e513ce19d914e2eb686078d44f
2009-10-14 12:11:56 -07:00
Raphael
369978fd31 am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
Merge commit '62437b9984649c80aa3a7d93750efdc5ff206d07' into eclair-mr2

* commit '62437b9984649c80aa3a7d93750efdc5ff206d07':
  Windows SDK: copy SDK Setup.exe at root of SDK.
2009-10-14 11:39:42 -07:00
Xavier Ducrohet
861465a93c am e19c0298: Merge change Idc447b41 into eclair
Merge commit 'e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-mr2

* commit 'e19c02984fd10c9fa35b036aafc1181cb8384069':
  UI to manage/create custom Layout Devices.
2009-10-14 07:37:28 -07:00
Raphael
62437b9984 Windows SDK: copy SDK Setup.exe at root of SDK.
Also add a source.properties (we'll install it on the vendor/google
script part of the script).

SDK BUG 2173135

Change-Id: Icb0f22a65ffd819bf7b0f48adbec51cbc1243f71
2009-10-14 07:21:26 -07:00
Android (Google) Code Review
e19c02984f Merge change Idc447b41 into eclair
* changes:
  UI to manage/create custom Layout Devices.
2009-10-14 01:51:44 -04:00
Xavier Ducrohet
18cd10783b am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Merge commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60' into eclair-mr2

* commit '3b9d33b3e0295445979ba9a36cb73780bc16fb60':
  Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
2009-10-13 20:46:47 -07:00
Xavier Ducrohet
37f35fdca0 am bc7c3672: Merge change I6dbcafab into eclair
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-mr2

* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
  Fix NPE in the parsing of property file.
2009-10-13 20:46:42 -07:00
Xavier Ducrohet
3b9d33b3e0 Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Change-Id: I6b95f5758c36979cca06483f1ff797ba67ecd056
2009-10-13 19:24:58 -07:00
Xavier Ducrohet
8f49a988e3 UI to manage/create custom Layout Devices.
Change-Id: Idc447b4136a6f709d7a665321af68de552ec613a
2009-10-13 18:35:13 -07:00
Android (Google) Code Review
bc7c36728c Merge change I6dbcafab into eclair
* changes:
  Fix NPE in the parsing of property file.
2009-10-13 14:41:47 -04:00
Android (Google) Code Review
60e45099aa Merge change Ibb660dd5 into eclair-mr2
* changes:
  updating sample plugins to support fixed surface dimensions.
2009-10-13 14:39:26 -04:00
Xavier Ducrohet
73ecae2fdc Fix NPE in the parsing of property file.
this could happen if the log object is null and the parsing fails.

Change-Id: I6dbcafab26c5405efba20b30f511104fcee5bf78
2009-10-13 10:28:16 -07:00