OSDN Git Service
Raphael [Sat, 17 Oct 2009 01:29:30 +0000 (18:29 -0700)]
am
17c0f72c: (-s ours) am
501d2ae5: am
ea82bcc2: (-s ours) am
5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '
17c0f72c8378956533a89624c715786be1e3ad52'
* commit '
17c0f72c8378956533a89624c715786be1e3ad52':
SDK Updater: properly update/install doc. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:29:26 +0000 (18:29 -0700)]
am
e0b0c2cc: (-s ours) am
1a63ee0b: am
15549af0: (-s ours) am
af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '
e0b0c2ccf1e267f843e9890b87d6649b8dc6059c'
* commit '
e0b0c2ccf1e267f843e9890b87d6649b8dc6059c':
Add save/load for the user-made Layout Devices. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:29:22 +0000 (18:29 -0700)]
am
ef04e43f: (-s ours) am
cad5cf2e: am
81747d72: (-s ours) am
5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '
ef04e43fb58cec4a9f2237379451a7fa0e9d1fe6'
* commit '
ef04e43fb58cec4a9f2237379451a7fa0e9d1fe6':
WQVGA skin (240x400) (do not merge)
Raphael [Sat, 17 Oct 2009 01:29:17 +0000 (18:29 -0700)]
am
f7b5b952: am
b1192a67: am
2a13cc20: SDK Updater: properly update/install doc.
Merge commit '
f7b5b952173539dd659082d036efe1617963c4a1'
* commit '
f7b5b952173539dd659082d036efe1617963c4a1':
SDK Updater: properly update/install doc.
Raphael [Sat, 17 Oct 2009 01:19:03 +0000 (18:19 -0700)]
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)
Xavier Ducrohet [Sat, 17 Oct 2009 01:19:00 +0000 (18:19 -0700)]
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)
Xavier Ducrohet [Sat, 17 Oct 2009 01:18:56 +0000 (18:18 -0700)]
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)
Raphael [Sat, 17 Oct 2009 01:18:52 +0000 (18:18 -0700)]
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.
Raphael [Sat, 17 Oct 2009 01:08:23 +0000 (18:08 -0700)]
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)
Xavier Ducrohet [Sat, 17 Oct 2009 01:08:18 +0000 (18:08 -0700)]
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)
Xavier Ducrohet [Sat, 17 Oct 2009 01:08:14 +0000 (18:08 -0700)]
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)
Raphael [Sat, 17 Oct 2009 01:08:10 +0000 (18:08 -0700)]
am
2a13cc20: SDK Updater: properly update/install doc.
Merge commit '
2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60' into eclair-mr2
* commit '
2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60':
SDK Updater: properly update/install doc.
Raphael [Sat, 17 Oct 2009 00:57:18 +0000 (17:57 -0700)]
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)
Xavier Ducrohet [Sat, 17 Oct 2009 00:57:15 +0000 (17:57 -0700)]
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)
Xavier Ducrohet [Sat, 17 Oct 2009 00:57:10 +0000 (17:57 -0700)]
am
5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '
5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf' into eclair
* commit '
5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf':
WQVGA skin (240x400) (do not merge)
Raphael [Thu, 15 Oct 2009 23:44:18 +0000 (16:44 -0700)]
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
Xavier Ducrohet [Thu, 15 Oct 2009 00:57:30 +0000 (17:57 -0700)]
Add save/load for the user-made Layout Devices. (do not merge)
Also added support for mcc/mnc in the schema.
Xavier Ducrohet [Thu, 15 Oct 2009 18:07:41 +0000 (11:07 -0700)]
WQVGA skin (240x400) (do not merge)
Raphael [Thu, 15 Oct 2009 23:44:18 +0000 (16:44 -0700)]
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
Raphael [Thu, 15 Oct 2009 22:41:39 +0000 (15:41 -0700)]
am
7afd643e: am
15ecb4b8: am
97eef6fd: Merge change Ifb00e723 into eclair
Merge commit '
7afd643ebd3c0127b88502e6183fd6cccd38b185'
* commit '
7afd643ebd3c0127b88502e6183fd6cccd38b185':
Actively remove the obsolete sdkuilib symlink.
Android (Google) Code Review [Thu, 15 Oct 2009 22:40:10 +0000 (18:40 -0400)]
Merge change Idf098ce6
* changes:
Added a filter to remove buildenv's warnings.
Raphael [Thu, 15 Oct 2009 22:31:37 +0000 (15:31 -0700)]
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.
Raphael [Thu, 15 Oct 2009 22:22:01 +0000 (15:22 -0700)]
am
97eef6fd: Merge change Ifb00e723 into eclair
Merge commit '
97eef6fdf0a26287dc7161b68f0978a691c175bb' into eclair-mr2
* commit '
97eef6fdf0a26287dc7161b68f0978a691c175bb':
Actively remove the obsolete sdkuilib symlink.
Android (Google) Code Review [Thu, 15 Oct 2009 22:14:10 +0000 (18:14 -0400)]
Merge change Ifb00e723 into eclair
* changes:
Actively remove the obsolete sdkuilib symlink.
Raphael [Thu, 15 Oct 2009 21:21:22 +0000 (14:21 -0700)]
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
David 'Digit' Turner [Thu, 15 Oct 2009 21:39:09 +0000 (14:39 -0700)]
am
0ee551bf: am
cbbcbd37: am
ddf1ac3e: Merge change I1db4662e into eclair
Merge commit '
0ee551bffd2f65d31998184dc6fb13eb81683fbb'
* commit '
0ee551bffd2f65d31998184dc6fb13eb81683fbb':
Remove bash-ism from build-toolchain.sh
Xavier Ducrohet [Thu, 15 Oct 2009 21:39:05 +0000 (14:39 -0700)]
am
d6f1d9fd: am
c7774433: am
bc3c3394: Merge change I8a2d2379 into eclair
Merge commit '
d6f1d9fd3f08f4f7765764d13adbfadd5a0a681c'
* commit '
d6f1d9fd3f08f4f7765764d13adbfadd5a0a681c':
Add save/load for the user-made Layout Devices.
David 'Digit' Turner [Thu, 15 Oct 2009 21:29:16 +0000 (14:29 -0700)]
am
cbbcbd37: am
ddf1ac3e: Merge change I1db4662e into eclair
Merge commit '
cbbcbd3742d14f68c4c9ac4a0ab3ca33b9c39a89' into eclair-mr2-plus-aosp
* commit '
cbbcbd3742d14f68c4c9ac4a0ab3ca33b9c39a89':
Remove bash-ism from build-toolchain.sh
Xavier Ducrohet [Thu, 15 Oct 2009 21:29:12 +0000 (14:29 -0700)]
am
c7774433: am
bc3c3394: Merge change I8a2d2379 into eclair
Merge commit '
c7774433dd82db05a4f92edf3f9d77f5d7c123b0' into eclair-mr2-plus-aosp
* commit '
c7774433dd82db05a4f92edf3f9d77f5d7c123b0':
Add save/load for the user-made Layout Devices.
David 'Digit' Turner [Thu, 15 Oct 2009 21:19:24 +0000 (14:19 -0700)]
am
ddf1ac3e: Merge change I1db4662e into eclair
Merge commit '
ddf1ac3efd863a203e449fb60a3d40f792377709' into eclair-mr2
* commit '
ddf1ac3efd863a203e449fb60a3d40f792377709':
Remove bash-ism from build-toolchain.sh
Xavier Ducrohet [Thu, 15 Oct 2009 21:19:19 +0000 (14:19 -0700)]
am
bc3c3394: Merge change I8a2d2379 into eclair
Merge commit '
bc3c3394fb773346eff4b4a0b695ff00edcc821e' into eclair-mr2
* commit '
bc3c3394fb773346eff4b4a0b695ff00edcc821e':
Add save/load for the user-made Layout Devices.
Android (Google) Code Review [Thu, 15 Oct 2009 21:08:32 +0000 (17:08 -0400)]
Merge change I1db4662e into eclair
* changes:
Remove bash-ism from build-toolchain.sh
Xavier Ducrohet [Thu, 15 Oct 2009 20:31:47 +0000 (13:31 -0700)]
David 'Digit' Turner [Thu, 15 Oct 2009 20:29:06 +0000 (13:29 -0700)]
Remove bash-ism from build-toolchain.sh
Xavier Ducrohet [Thu, 15 Oct 2009 20:22:01 +0000 (13:22 -0700)]
am
7e377d38: am
cade0d0b: Merge change Icb3327e2 into eclair
Merge commit '
7e377d385c05af87511a73e4ae08a7f05b7ba1c3' into eclair-mr2-plus-aosp
* commit '
7e377d385c05af87511a73e4ae08a7f05b7ba1c3':
WQVGA skin (240x400)
Android (Google) Code Review [Thu, 15 Oct 2009 20:18:31 +0000 (16:18 -0400)]
Merge change I8a2d2379 into eclair
* changes:
Add save/load for the user-made Layout Devices.
Xavier Ducrohet [Thu, 15 Oct 2009 20:11:41 +0000 (13:11 -0700)]
am
cade0d0b: Merge change Icb3327e2 into eclair
Merge commit '
cade0d0b175b7de6921cffdbcb596778a282e56f' into eclair-mr2
* commit '
cade0d0b175b7de6921cffdbcb596778a282e56f':
WQVGA skin (240x400)
Xavier Ducrohet [Thu, 15 Oct 2009 00:57:30 +0000 (17:57 -0700)]
Add save/load for the user-made Layout Devices.
Also added support for mcc/mnc in the schema.
Change-Id: I8a2d23797ec57eec69dc1d7218b01cd679634068
Android (Google) Code Review [Thu, 15 Oct 2009 20:05:33 +0000 (16:05 -0400)]
Merge change Icb3327e2 into eclair
* changes:
WQVGA skin (240x400)
Nicolas Catania [Thu, 15 Oct 2009 17:48:01 +0000 (10:48 -0700)]
Added a filter to remove buildenv's warnings.
Warnings about makefiles and build scripts interfere
with `next-error'. If you are interested only in the
errors from the source file, a custom variable allows
you to nuke build env warnings.
The filter is registered as a compilation-filter-hook.
Xavier Ducrohet [Thu, 15 Oct 2009 18:07:41 +0000 (11:07 -0700)]
WQVGA skin (240x400)
Change-Id: Icb3327e2371800029844a869df6abd68a8516aff
Dianne Hackborn [Thu, 15 Oct 2009 01:39:34 +0000 (18:39 -0700)]
am
a907a4f7: am
862eadb6: am
a8baf9bc: Merge change Ie7eb359a into eclair
Merge commit '
a907a4f7a2660934f13da0fee32917947195c9c1'
* commit '
a907a4f7a2660934f13da0fee32917947195c9c1':
Tweaks to Pointer Location.
Dianne Hackborn [Thu, 15 Oct 2009 01:30:21 +0000 (18:30 -0700)]
am
862eadb6: am
a8baf9bc: Merge change Ie7eb359a into eclair
Merge commit '
862eadb62221429b9e2bb86dd6b7c9c61110e95b' into eclair-mr2-plus-aosp
* commit '
862eadb62221429b9e2bb86dd6b7c9c61110e95b':
Tweaks to Pointer Location.
Dianne Hackborn [Thu, 15 Oct 2009 01:21:28 +0000 (18:21 -0700)]
am
a8baf9bc: Merge change Ie7eb359a into eclair
Merge commit '
a8baf9bcc8d9776e9aba35207af17723f7226027' into eclair-mr2
* commit '
a8baf9bcc8d9776e9aba35207af17723f7226027':
Tweaks to Pointer Location.
Android (Google) Code Review [Thu, 15 Oct 2009 01:14:36 +0000 (21:14 -0400)]
Merge change Ie7eb359a into eclair
* changes:
Tweaks to Pointer Location.
Dianne Hackborn [Wed, 14 Oct 2009 23:30:09 +0000 (16:30 -0700)]
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
Xavier Ducrohet [Wed, 14 Oct 2009 23:28:53 +0000 (16:28 -0700)]
David 'Digit' Turner [Wed, 14 Oct 2009 23:28:49 +0000 (16:28 -0700)]
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:28:46 +0000 (16:28 -0700)]
am
b8f35789: merge from open-source master
Merge commit '
b8f35789df5f7ec6405cb05d2bdb8dc52ed082a9'
* commit '
b8f35789df5f7ec6405cb05d2bdb8dc52ed082a9':
Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
Fix device dpi handling in the Layout device parsing/UI.
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:28:41 +0000 (16:28 -0700)]
Xavier Ducrohet [Wed, 14 Oct 2009 23:16:48 +0000 (16:16 -0700)]
am
82bb67e5: am
8dd4e92c: Merge change I74fdf8c6 into eclair
Merge commit '
82bb67e55593074cc83123fe703e99c816463586' into eclair-mr2-plus-aosp
* commit '
82bb67e55593074cc83123fe703e99c816463586':
David 'Digit' Turner [Wed, 14 Oct 2009 23:16:43 +0000 (16:16 -0700)]
am
f9aa7764: am
7fe9c714: Merge change I3986492c into eclair
Merge commit '
f9aa7764aabb10fc0b7abc9e72d27a38b2547b35' into eclair-mr2-plus-aosp
* commit '
f9aa7764aabb10fc0b7abc9e72d27a38b2547b35':
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:12:05 +0000 (16:12 -0700)]
merge from open-source master
Xavier Ducrohet [Wed, 14 Oct 2009 23:07:23 +0000 (16:07 -0700)]
am
8dd4e92c: Merge change I74fdf8c6 into eclair
Merge commit '
8dd4e92cc6838b811b7e8b81cb87bb1533bbf789' into eclair-plus-aosp
* commit '
8dd4e92cc6838b811b7e8b81cb87bb1533bbf789':
Fix device dpi handling in the Layout device parsing/UI.
David 'Digit' Turner [Wed, 14 Oct 2009 23:07:19 +0000 (16:07 -0700)]
am
7fe9c714: Merge change I3986492c into eclair
Merge commit '
7fe9c71413aad609b32fd433278ee1d9db673b2e' into eclair-plus-aosp
* commit '
7fe9c71413aad609b32fd433278ee1d9db673b2e':
Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
Xavier Ducrohet [Wed, 14 Oct 2009 23:06:26 +0000 (16:06 -0700)]
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.
David 'Digit' Turner [Wed, 14 Oct 2009 23:06:21 +0000 (16:06 -0700)]
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.
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:09 +0000 (16:02 -0700)]
merge from open-source master
Android (Google) Code Review [Wed, 14 Oct 2009 22:58:02 +0000 (18:58 -0400)]
Merge change I74fdf8c6 into eclair
* changes:
Fix device dpi handling in the Layout device parsing/UI.
Android (Google) Code Review [Wed, 14 Oct 2009 22:57:32 +0000 (18:57 -0400)]
Merge change I3986492c into eclair
* changes:
Add --prebuilt-ndk=FILE and --no-git options to build/tools/make-release.sh script.
David 'Digit' Turner [Wed, 14 Oct 2009 22:22:11 +0000 (15:22 -0700)]
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.
Raphael [Wed, 14 Oct 2009 22:35:16 +0000 (15:35 -0700)]
am
5bb5b9ae: am
135ae886: Merge change Idad5a0ab into eclair
Merge commit '
5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff'
* commit '
5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff':
SDK: Remove STOPSHIP keyword.
Xavier Ducrohet [Wed, 14 Oct 2009 22:25:15 +0000 (15:25 -0700)]
Fix device dpi handling in the Layout device parsing/UI.
Change-Id: I74fdf8c62a7b005e40e1817d9f39c59d8f99c070
Raphael [Wed, 14 Oct 2009 19:27:12 +0000 (12:27 -0700)]
am
135ae886: Merge change Idad5a0ab into eclair
Merge commit '
135ae88641599194c398cd5dbcee535313921f7a' into eclair-mr2
* commit '
135ae88641599194c398cd5dbcee535313921f7a':
SDK: Remove STOPSHIP keyword.
Raphael [Wed, 14 Oct 2009 19:26:57 +0000 (12:26 -0700)]
am
135ae886: Merge change Idad5a0ab into eclair
Merge commit '
135ae88641599194c398cd5dbcee535313921f7a' into eclair-plus-aosp
* commit '
135ae88641599194c398cd5dbcee535313921f7a':
SDK: Remove STOPSHIP keyword.
Android (Google) Code Review [Wed, 14 Oct 2009 19:16:28 +0000 (15:16 -0400)]
Merge change Idad5a0ab into eclair
* changes:
SDK: Remove STOPSHIP keyword.
Raphael [Wed, 14 Oct 2009 19:11:56 +0000 (12:11 -0700)]
SDK: Remove STOPSHIP keyword.
Change-Id: Idad5a0ab0f31c3e513ce19d914e2eb686078d44f
Raphael [Wed, 14 Oct 2009 18:58:49 +0000 (11:58 -0700)]
am
369978fd: am
62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
Merge commit '
369978fd3167a19f3e2e303c8874b66e8429f25f'
* commit '
369978fd3167a19f3e2e303c8874b66e8429f25f':
Windows SDK: copy SDK Setup.exe at root of SDK.
Raphael [Wed, 14 Oct 2009 18:39:54 +0000 (11:39 -0700)]
am
62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
Merge commit '
62437b9984649c80aa3a7d93750efdc5ff206d07' into eclair-plus-aosp
* commit '
62437b9984649c80aa3a7d93750efdc5ff206d07':
Windows SDK: copy SDK Setup.exe at root of SDK.
Raphael [Wed, 14 Oct 2009 18:39:42 +0000 (11:39 -0700)]
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.
Android (Google) Code Review [Wed, 14 Oct 2009 17:02:18 +0000 (13:02 -0400)]
Merge change I94f75699
* changes:
Reimport translations.
Xavier Ducrohet [Wed, 14 Oct 2009 14:56:14 +0000 (07:56 -0700)]
am
861465a9: am
e19c0298: Merge change Idc447b41 into eclair
Merge commit '
861465a93c9634e1c2a345882ae71d0c3e21f4a2'
* commit '
861465a93c9634e1c2a345882ae71d0c3e21f4a2':
UI to manage/create custom Layout Devices.
Xavier Ducrohet [Wed, 14 Oct 2009 14:37:28 +0000 (07:37 -0700)]
am
e19c0298: Merge change Idc447b41 into eclair
Merge commit '
e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-mr2
* commit '
e19c02984fd10c9fa35b036aafc1181cb8384069':
UI to manage/create custom Layout Devices.
Raphael [Wed, 14 Oct 2009 13:52:59 +0000 (06:52 -0700)]
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
Xavier Ducrohet [Wed, 14 Oct 2009 05:57:57 +0000 (22:57 -0700)]
am
e19c0298: Merge change Idc447b41 into eclair
Merge commit '
e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-plus-aosp
* commit '
e19c02984fd10c9fa35b036aafc1181cb8384069':
UI to manage/create custom Layout Devices.
Android (Google) Code Review [Wed, 14 Oct 2009 05:51:44 +0000 (01:51 -0400)]
Merge change Idc447b41 into eclair
* changes:
UI to manage/create custom Layout Devices.
Xavier Ducrohet [Wed, 14 Oct 2009 04:05:12 +0000 (21:05 -0700)]
am
18cd1078: am
3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Merge commit '
18cd10783b01156169c44f76778590cdf25beaa2'
* commit '
18cd10783b01156169c44f76778590cdf25beaa2':
Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Xavier Ducrohet [Wed, 14 Oct 2009 04:05:07 +0000 (21:05 -0700)]
am
37f35fdc: am
bc7c3672: Merge change I6dbcafab into eclair
Merge commit '
37f35fdca099beabcef9220b809c42c7567c9749'
* commit '
37f35fdca099beabcef9220b809c42c7567c9749':
Fix NPE in the parsing of property file.
Xavier Ducrohet [Wed, 14 Oct 2009 03:47:22 +0000 (20:47 -0700)]
am
3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Merge commit '
3b9d33b3e0295445979ba9a36cb73780bc16fb60' into eclair-plus-aosp
* commit '
3b9d33b3e0295445979ba9a36cb73780bc16fb60':
Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Xavier Ducrohet [Wed, 14 Oct 2009 03:47:17 +0000 (20:47 -0700)]
am
bc7c3672: Merge change I6dbcafab into eclair
Merge commit '
bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-plus-aosp
* commit '
bc7c36728c353102ff8b0280b403cf348f47581e':
Fix NPE in the parsing of property file.
Xavier Ducrohet [Wed, 14 Oct 2009 03:46:47 +0000 (20:46 -0700)]
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.
Xavier Ducrohet [Wed, 14 Oct 2009 03:46:42 +0000 (20:46 -0700)]
am
bc7c3672: Merge change I6dbcafab into eclair
Merge commit '
bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-mr2
* commit '
bc7c36728c353102ff8b0280b403cf348f47581e':
Fix NPE in the parsing of property file.
Xavier Ducrohet [Wed, 14 Oct 2009 02:24:58 +0000 (19:24 -0700)]
Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
Change-Id: I6b95f5758c36979cca06483f1ff797ba67ecd056
Xavier Ducrohet [Thu, 1 Oct 2009 08:58:52 +0000 (01:58 -0700)]
UI to manage/create custom Layout Devices.
Change-Id: Idc447b4136a6f709d7a665321af68de552ec613a
Derek Sollenberger [Wed, 14 Oct 2009 00:08:26 +0000 (17:08 -0700)]
am
60e45099: Merge change Ibb660dd5 into eclair-mr2
Merge commit '
60e45099aa404686c3b6d38187306fe5bb90cd8f'
* commit '
60e45099aa404686c3b6d38187306fe5bb90cd8f':
updating sample plugins to support fixed surface dimensions.
Raphael [Wed, 14 Oct 2009 00:06:06 +0000 (17:06 -0700)]
am
f4fe738d: am
96fc3df6: Merge change Ib096f1f0 into eclair
Merge commit '
f4fe738d0f18f361815c0bdffefece726b622706'
* commit '
f4fe738d0f18f361815c0bdffefece726b622706':
SDK Manager: suggest install of new platforms, addons or extra packages.
Raphael [Wed, 14 Oct 2009 00:03:58 +0000 (17:03 -0700)]
am
46ab498e: am
9bdf821f: SDK: Support "android.bat update sdk"
Merge commit '
46ab498e50ba71467c71ebe14784706148554b86'
* commit '
46ab498e50ba71467c71ebe14784706148554b86':
SDK: Support "android.bat update sdk"
Raphael [Wed, 14 Oct 2009 00:03:26 +0000 (17:03 -0700)]
am
acadcaca: am
5ca98eb0: Merge change I5359971f into eclair
Merge commit '
acadcaca51b8bedaaa8b188c8800ffc323d0bd06'
* commit '
acadcaca51b8bedaaa8b188c8800ffc323d0bd06':
New "SDK Launcher" for Windows.
Raphael [Wed, 14 Oct 2009 00:02:21 +0000 (17:02 -0700)]
am
8583fb38: am
6fb8880a: Merge change I26a21669 into eclair
Merge commit '
8583fb381bf2bedee8efa85abda42673ba9f7a9c'
* commit '
8583fb381bf2bedee8efa85abda42673ba9f7a9c':
Set SDK Platform/Doc to API 5.
Raphael [Tue, 13 Oct 2009 23:57:25 +0000 (16:57 -0700)]
am
7dcaccf3: am
e4c98c01: SDK Manager: display packages revisions
Merge commit '
7dcaccf359f25586218d33a28cd05ad81af43fb1'
* commit '
7dcaccf359f25586218d33a28cd05ad81af43fb1':
SDK Manager: display packages revisions
Raphael [Tue, 13 Oct 2009 23:57:21 +0000 (16:57 -0700)]
am
d3fb418c: am
e7ad6a5e: Merge change I2fb42327 into eclair
Merge commit '
d3fb418c7c82c47c0b2c1d9b5383d4aca428252f'
* commit '
d3fb418c7c82c47c0b2c1d9b5383d4aca428252f':
SDK Manager: extra packages must respect min-tools-rev too.
Raphael [Tue, 13 Oct 2009 23:57:17 +0000 (16:57 -0700)]
am
7fd178a0: am
52eb73d2: Merge change I408e3eda into eclair
Merge commit '
7fd178a0e0345741cf18bc24ea5e68df2776f6b8'
* commit '
7fd178a0e0345741cf18bc24ea5e68df2776f6b8':
SDK Manager: fix selection of non-expanded remote archives.
Jack Palevich [Tue, 13 Oct 2009 23:57:13 +0000 (16:57 -0700)]
am
edb55982: Fix Terminal Preferences, Resolution
Merge commit '
edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0'
* commit '
edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0':
Fix Terminal Preferences, Resolution
Xavier Ducrohet [Tue, 13 Oct 2009 23:57:08 +0000 (16:57 -0700)]
Raphael [Tue, 13 Oct 2009 23:57:04 +0000 (16:57 -0700)]
am
da615ec6: am
31d0121f: Fix adt-tests: remove UpdaterLogicTest
Merge commit '
da615ec62d1897eee2c36aa20a6e5723bcd40d19'
* commit '
da615ec62d1897eee2c36aa20a6e5723bcd40d19':
Fix adt-tests: remove UpdaterLogicTest
Xavier Ducrohet [Tue, 13 Oct 2009 23:55:10 +0000 (16:55 -0700)]
am
d2560f89: am
4d59d18a: Merge change Ib18a32c1 into eclair
Merge commit '
d2560f89dda8adc3226d3aefb429d4b2c07e6bc3'
* commit '
d2560f89dda8adc3226d3aefb429d4b2c07e6bc3':
Minor label change (size -> resolution)
Brett Chabot [Tue, 13 Oct 2009 23:54:51 +0000 (16:54 -0700)]
am
2a910437: am
d00a9bcf: Merge change I3e6a5048 into eclair
Merge commit '
2a9104372f9f154b134f5c3386a4f95c8813b89f'
* commit '
2a9104372f9f154b134f5c3386a4f95c8813b89f':
Fix ADT tests failures:
Brett Chabot [Tue, 13 Oct 2009 23:52:21 +0000 (16:52 -0700)]
am
4226ff3e: am
8842cfe4: Merge change Ic77859c7 into eclair
Merge commit '
4226ff3e30571af63aaf1548305af35607198b5c'
* commit '
4226ff3e30571af63aaf1548305af35607198b5c':
Remove flaky ApiDemos tests from continuous.
Raphael [Tue, 13 Oct 2009 23:52:10 +0000 (16:52 -0700)]
am
d61dddbb: am
773e9af6: Merge change Ied6c54f1 into eclair
Merge commit '
d61dddbb18c619b6dfc3fd6d67c4baebc513c35f'
* commit '
d61dddbb18c619b6dfc3fd6d67c4baebc513c35f':
Fix continuous adt-test: UpdaterLogic is now public.
Brett Chabot [Tue, 13 Oct 2009 23:51:55 +0000 (16:51 -0700)]
am
0d4f7cd4: am
264d42dd: Merge change Idf5bcb58 into eclair
Merge commit '
0d4f7cd48a2544c6a964bdd86d829692bc25b681'
* commit '
0d4f7cd48a2544c6a964bdd86d829692bc25b681':
Fix ant install when -Dadb.device.arg not provided.
OSDN Git Service
