OSDN Git Service

android-x86/sdk.git
14 years agoam fab13c85: am 7e377d38: am cade0d0b: Merge change Icb3327e2 into eclair
Xavier Ducrohet [Thu, 15 Oct 2009 20:31:47 +0000 (13:31 -0700)]
am fab13c85: am 7e377d38: am cade0d0b: Merge change Icb3327e2 into eclair

Merge commit 'fab13c85726d5d1385c3156b18d42b8508c5fb63'

* commit 'fab13c85726d5d1385c3156b18d42b8508c5fb63':
  WQVGA skin (240x400)

14 years agoam 7e377d38: am cade0d0b: Merge change Icb3327e2 into eclair
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)

14 years agoam cade0d0b: Merge change Icb3327e2 into eclair
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)

14 years agoMerge change Icb3327e2 into eclair
Android (Google) Code Review [Thu, 15 Oct 2009 20:05:33 +0000 (16:05 -0400)]
Merge change Icb3327e2 into eclair

* changes:
  WQVGA skin (240x400)

14 years agoWQVGA skin (240x400)
Xavier Ducrohet [Thu, 15 Oct 2009 18:07:41 +0000 (11:07 -0700)]
WQVGA skin (240x400)

Change-Id: Icb3327e2371800029844a869df6abd68a8516aff

14 years agoam a907a4f7: am 862eadb6: am a8baf9bc: Merge change Ie7eb359a into eclair
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.

14 years agoam 862eadb6: am a8baf9bc: Merge change Ie7eb359a into eclair
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.

14 years agoam a8baf9bc: Merge change Ie7eb359a into eclair
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.

14 years agoMerge change Ie7eb359a into eclair
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.

14 years agoTweaks 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

14 years agoam c193dc51: am 82bb67e5: am 8dd4e92c: Merge change I74fdf8c6 into eclair
Xavier Ducrohet [Wed, 14 Oct 2009 23:28:53 +0000 (16:28 -0700)]
am c193dc51: am 82bb67e5: am 8dd4e92c: Merge change I74fdf8c6 into eclair

Merge commit 'c193dc51052abb42ae9486855b50a3735aa9261d'

* commit 'c193dc51052abb42ae9486855b50a3735aa9261d':

14 years agoam 1bda9e1a: am f9aa7764: am 7fe9c714: Merge change I3986492c into eclair
David 'Digit' Turner [Wed, 14 Oct 2009 23:28:49 +0000 (16:28 -0700)]
am 1bda9e1a: am f9aa7764: am 7fe9c714: Merge change I3986492c into eclair

Merge commit '1bda9e1a5eb5c028f9439bf1a1869c6df25e78f4'

* commit '1bda9e1a5eb5c028f9439bf1a1869c6df25e78f4':

14 years agoam b8f35789: merge from open-source master
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.

14 years agoam a7978d3b: merge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:28:41 +0000 (16:28 -0700)]
am a7978d3b: merge from open-source master

Merge commit 'a7978d3bb0070495a9310dde4befa22a5b5ace4d'

* commit 'a7978d3bb0070495a9310dde4befa22a5b5ace4d':

14 years agoam 82bb67e5: am 8dd4e92c: Merge change I74fdf8c6 into eclair
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':

14 years agoam f9aa7764: am 7fe9c714: Merge change I3986492c into eclair
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':

14 years agomerge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:12:05 +0000 (16:12 -0700)]
merge from open-source master

14 years agoam 8dd4e92c: Merge change I74fdf8c6 into eclair
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.

14 years agoam 7fe9c714: Merge change I3986492c into eclair
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.

14 years agoam 8dd4e92c: Merge change I74fdf8c6 into eclair
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.

14 years agoam 7fe9c714: Merge change I3986492c into eclair
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.

14 years agomerge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:09 +0000 (16:02 -0700)]
merge from open-source master

14 years agoMerge change I74fdf8c6 into eclair
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.

14 years agoMerge change I3986492c into eclair
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.

14 years agoAdd --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.

14 years agoam 5bb5b9ae: am 135ae886: Merge change Idad5a0ab into eclair
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.

14 years agoFix device dpi handling in the Layout device parsing/UI.
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

14 years agoam 135ae886: Merge change Idad5a0ab into eclair
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.

14 years agoam 135ae886: Merge change Idad5a0ab into eclair
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.

14 years agoMerge change Idad5a0ab into eclair
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.

14 years agoSDK: Remove STOPSHIP keyword.
Raphael [Wed, 14 Oct 2009 19:11:56 +0000 (12:11 -0700)]
SDK: Remove STOPSHIP keyword.

Change-Id: Idad5a0ab0f31c3e513ce19d914e2eb686078d44f

14 years agoam 369978fd: am 62437b99: Windows SDK: copy SDK Setup.exe at root of SDK.
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.

14 years agoam 62437b99: 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.

14 years agoam 62437b99: 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.

14 years agoMerge change I94f75699
Android (Google) Code Review [Wed, 14 Oct 2009 17:02:18 +0000 (13:02 -0400)]
Merge change I94f75699

* changes:
  Reimport translations.

14 years agoam 861465a9: am e19c0298: Merge change Idc447b41 into eclair
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.

14 years agoam e19c0298: Merge change Idc447b41 into eclair
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.

14 years agoWindows SDK: copy SDK Setup.exe at root of SDK.
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

14 years agoam e19c0298: Merge change Idc447b41 into eclair
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.

14 years agoMerge change Idc447b41 into eclair
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.

14 years agoam 18cd1078: am 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers...
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.

14 years agoam 37f35fdc: am bc7c3672: Merge change I6dbcafab into eclair
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.

14 years agoam 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
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.

14 years agoam bc7c3672: Merge change I6dbcafab into eclair
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.

14 years agoam 3b9d33b3: Fix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
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.

14 years agoam bc7c3672: Merge change I6dbcafab into eclair
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.

14 years agoFix RawImage.getARGB to force alpha to 0xFF for buffers with no alpha.
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

14 years agoUI to manage/create custom Layout Devices.
Xavier Ducrohet [Thu, 1 Oct 2009 08:58:52 +0000 (01:58 -0700)]
UI to manage/create custom Layout Devices.

Change-Id: Idc447b4136a6f709d7a665321af68de552ec613a

14 years agoam 60e45099: Merge change Ibb660dd5 into eclair-mr2
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.

14 years agoam f4fe738d: am 96fc3df6: Merge change Ib096f1f0 into eclair
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.

14 years agoam 46ab498e: am 9bdf821f: SDK: Support "android.bat update sdk"
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"

14 years agoam acadcaca: am 5ca98eb0: Merge change I5359971f into eclair
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.

14 years agoam 8583fb38: am 6fb8880a: Merge change I26a21669 into eclair
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.

14 years agoam 7dcaccf3: am e4c98c01: SDK Manager: display packages revisions
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

14 years agoam d3fb418c: am e7ad6a5e: Merge change I2fb42327 into eclair
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.

14 years agoam 7fd178a0: am 52eb73d2: Merge change I408e3eda into eclair
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.

14 years agoam edb55982: Fix Terminal Preferences, Resolution
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

14 years agoam 5e04446c: am 126a1950: Add missing override.
Xavier Ducrohet [Tue, 13 Oct 2009 23:57:08 +0000 (16:57 -0700)]
am 5e04446c: am 126a1950: Add missing override.

Merge commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40'

* commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40':
  Add missing override.

14 years agoam da615ec6: am 31d0121f: Fix adt-tests: remove UpdaterLogicTest
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

14 years agoam d2560f89: am 4d59d18a: Merge change Ib18a32c1 into eclair
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)

14 years agoam 2a910437: am d00a9bcf: Merge change I3e6a5048 into eclair
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:

14 years agoam 4226ff3e: am 8842cfe4: Merge change Ic77859c7 into eclair
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.

14 years agoam d61dddbb: am 773e9af6: Merge change Ied6c54f1 into eclair
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.

14 years agoam 0d4f7cd4: am 264d42dd: Merge change Idf5bcb58 into eclair
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.

14 years agoam 0c384c58: am b2fa9b71: Merge change I2c7af74e into eclair
Raphael [Tue, 13 Oct 2009 23:51:15 +0000 (16:51 -0700)]
am 0c384c58: am b2fa9b71: Merge change I2c7af74e into eclair

Merge commit '0c384c581432c64121b53082bc6b348c342dd6f1'

* commit '0c384c581432c64121b53082bc6b348c342dd6f1':
  SDK Updater: don't auto-expand archives when selecting a package

14 years agoReimport translations.
Eric Fischer [Tue, 13 Oct 2009 23:28:31 +0000 (16:28 -0700)]
Reimport translations.

Change-Id: I94f75699909161b4357b1678849e6a45fabe9e7c

14 years agoMerge change I2022dcd9
Android (Google) Code Review [Tue, 13 Oct 2009 19:15:12 +0000 (15:15 -0400)]
Merge change I2022dcd9

* changes:
  Standardized on one single output buffer for all the commands output.

14 years agoam 494bb69b: Merge change I79297bbe into eclair-mr2
Jack Palevich [Tue, 13 Oct 2009 19:11:19 +0000 (12:11 -0700)]
am 494bb69b: Merge change I79297bbe into eclair-mr2

Merge commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810'

* commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810':
  Turn of log message that was accidentally left on in an earlier commit.

14 years agoam b80add6c: am 3334a587: Fix "android create project" to properly set name in string...
Raphael [Tue, 13 Oct 2009 19:00:33 +0000 (12:00 -0700)]
am b80add6c: am 3334a587: Fix "android create project" to properly set name in strings.xml

Merge commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4'

* commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4':
  Fix "android create project" to properly set name in strings.xml

14 years agoam cfd96c9a: am 8eff7f57: Support adb device-targeting arguments in ant scripts.
Raphael [Tue, 13 Oct 2009 19:00:28 +0000 (12:00 -0700)]
am cfd96c9a: am 8eff7f57: Support adb device-targeting arguments in ant scripts.

Merge commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1'

* commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1':
  Support adb device-targeting arguments in ant scripts.

14 years agoam ab1b631b: am f40ac8d6: Merge change Ic4387354 into eclair
Xavier Ducrohet [Tue, 13 Oct 2009 19:00:24 +0000 (12:00 -0700)]
am ab1b631b: am f40ac8d6: Merge change Ic4387354 into eclair

Merge commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142'

* commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142':
  Make WVGA/High skins use a higher VM heap size.

14 years agoam 1d85d8d1: am 97a6420d: Merge change I935c71f2 into eclair
Raphael [Tue, 13 Oct 2009 19:00:20 +0000 (12:00 -0700)]
am 1d85d8d1: am 97a6420d: Merge change I935c71f2 into eclair

Merge commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956'

* commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956':
  Add sholes to Windows USB Driver in Eclair.

14 years agoam 9c8f3496: am f3ae13d0: Merge change I7d549c26 into eclair
Raphael [Tue, 13 Oct 2009 19:00:15 +0000 (12:00 -0700)]
am 9c8f3496: am f3ae13d0: Merge change I7d549c26 into eclair

Merge commit '9c8f3496f105d7ebb375a8dc2e39f554e3b16156'

* commit '9c8f3496f105d7ebb375a8dc2e39f554e3b16156':
  Add SdkUiLib tests to adt-tests.

14 years agoam 3dcef76d: am 0947e82e: Merge change Ica46d149 into eclair
Raphael [Tue, 13 Oct 2009 19:00:11 +0000 (12:00 -0700)]
am 3dcef76d: am 0947e82e: Merge change Ica46d149 into eclair

Merge commit '3dcef76d30e6f2aae495c6236ed29f1b3f8ae421'

* commit '3dcef76d30e6f2aae495c6236ed29f1b3f8ae421':
  SDK Updater: platform dependency on tools, addon dependency on platform.

14 years agoam fb00ff8a: am 9cb6feee: Merge change Ia20b55c7 into eclair
Xavier Ducrohet [Tue, 13 Oct 2009 19:00:07 +0000 (12:00 -0700)]
am fb00ff8a: am 9cb6feee: Merge change Ia20b55c7 into eclair

Merge commit 'fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5'

* commit 'fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5':
  Add hardware support to AVD creation dialog.

14 years agoam d410b728: am b7c548eb: am fb244224: merge from donut-gms
Jean-Baptiste Queru [Tue, 13 Oct 2009 19:00:03 +0000 (12:00 -0700)]
am d410b728: am b7c548eb: am fb244224: merge from donut-gms

Merge commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d'

* commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d':
  Remove unnecessary preprocessing of monkey commands, fix bug where it didn't recognize '@', '+', '.', etc.
  adding a recorder function to collect output into an xml file; adding getvars and listvars command to MonkeyRunner
  Add runtest test def for cts-webkit.

14 years agoam 7b7bdf13: am 32739c61: Merge change I2e026098 into eclair
Marco Nelissen [Tue, 13 Oct 2009 18:55:23 +0000 (11:55 -0700)]
am 7b7bdf13: am 32739c61: Merge change I2e026098 into eclair

Merge commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a'

* commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a':
  Three implementations of a live wallpaper showing a spinning cube.

14 years agoMerge change I6dbcafab into eclair
Android (Google) Code Review [Tue, 13 Oct 2009 18:41:47 +0000 (14:41 -0400)]
Merge change I6dbcafab into eclair

* changes:
  Fix NPE in the parsing of property file.

14 years agoMerge change Ibb660dd5 into eclair-mr2
Android (Google) Code Review [Tue, 13 Oct 2009 18:39:26 +0000 (14:39 -0400)]
Merge change Ibb660dd5 into eclair-mr2

* changes:
  updating sample plugins to support fixed surface dimensions.

14 years agoFix NPE in the parsing of property file.
Xavier Ducrohet [Tue, 13 Oct 2009 17:28:16 +0000 (10:28 -0700)]
Fix NPE in the parsing of property file.

this could happen if the log object is null and the parsing fails.

Change-Id: I6dbcafab26c5405efba20b30f511104fcee5bf78

14 years agoMerge change I800158fb
Android (Google) Code Review [Tue, 13 Oct 2009 16:53:58 +0000 (12:53 -0400)]
Merge change I800158fb

* changes:
  Add new tabs for Compatibility and Get Source to source.android.com framework

14 years agoam 96fc3df6: Merge change Ib096f1f0 into eclair
Raphael [Tue, 13 Oct 2009 16:45:25 +0000 (09:45 -0700)]
am 96fc3df6: Merge change Ib096f1f0 into eclair

Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-mr2

* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
  SDK Manager: suggest install of new platforms, addons or extra packages.

14 years agoStandardized on one single output buffer for all the commands output.
Nicolas Catania [Tue, 13 Oct 2009 16:10:19 +0000 (09:10 -0700)]
Standardized on one single output buffer for all the commands output.

All the commands output go to an *Android Output* buffer which
gets cleaned up before each command run.

Fixed a compilation bug, building from the top Makefile was not
generating a new image.

14 years agoupdating sample plugins to support fixed surface dimensions.
Derek Sollenberger [Tue, 13 Oct 2009 15:43:48 +0000 (11:43 -0400)]
updating sample plugins to support fixed surface dimensions.

14 years agoam 96fc3df6: Merge change Ib096f1f0 into eclair
Raphael [Tue, 13 Oct 2009 04:46:50 +0000 (21:46 -0700)]
am 96fc3df6: Merge change Ib096f1f0 into eclair

Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-plus-aosp

* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
  SDK Manager: suggest install of new platforms, addons or extra packages.

14 years agoMerge change Ib096f1f0 into eclair
Android (Google) Code Review [Tue, 13 Oct 2009 04:38:11 +0000 (00:38 -0400)]
Merge change Ib096f1f0 into eclair

* changes:
  SDK Manager: suggest install of new platforms, addons or extra packages.

14 years agoam 9bdf821f: SDK: Support "android.bat update sdk"
Raphael [Mon, 12 Oct 2009 22:46:52 +0000 (15:46 -0700)]
am 9bdf821f: SDK: Support "android.bat update sdk"

Merge commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268' into eclair-mr2

* commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268':
  SDK: Support "android.bat update sdk"

14 years agoam 9bdf821f: SDK: Support "android.bat update sdk"
Raphael [Mon, 12 Oct 2009 22:37:42 +0000 (15:37 -0700)]
am 9bdf821f: SDK: Support "android.bat update sdk"

Merge commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268' into eclair-plus-aosp

* commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268':
  SDK: Support "android.bat update sdk"

14 years agoSDK: Support "android.bat update sdk"
Raphael [Mon, 12 Oct 2009 22:20:52 +0000 (15:20 -0700)]
SDK: Support "android.bat update sdk"

This ammends the batch file to recognize "android update sdk" to start
the updater UI.

SDK BUG 2173128 2173150

Change-Id: I3a2b9df9a3c52aa86bf34d05389c4034d60d57dc

14 years agoam 5ca98eb0: Merge change I5359971f into eclair
Raphael [Mon, 12 Oct 2009 21:23:29 +0000 (14:23 -0700)]
am 5ca98eb0: Merge change I5359971f into eclair

Merge commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1' into eclair-plus-aosp

* commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1':
  New "SDK Launcher" for Windows.

14 years agoam 5ca98eb0: Merge change I5359971f into eclair
Raphael [Mon, 12 Oct 2009 21:22:54 +0000 (14:22 -0700)]
am 5ca98eb0: Merge change I5359971f into eclair

Merge commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1' into eclair-mr2

* commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1':
  New "SDK Launcher" for Windows.

14 years agoMerge change I5359971f into eclair
Android (Google) Code Review [Mon, 12 Oct 2009 21:13:23 +0000 (17:13 -0400)]
Merge change I5359971f into eclair

* changes:
  New "SDK Launcher" for Windows.

14 years agoSDK Manager: suggest install of new platforms, addons or extra packages.
Raphael [Sat, 10 Oct 2009 01:24:08 +0000 (18:24 -0700)]
SDK Manager: suggest install of new platforms, addons or extra packages.

Supports the new "android update sdk" action.

Change-Id: Ib096f1f024639018252c58d4f9c8872ead3c39b9

14 years agoMerge change I204a77b2
Android (Google) Code Review [Mon, 12 Oct 2009 20:03:24 +0000 (16:03 -0400)]
Merge change I204a77b2

* changes:
  New interactive functions to send commands to a device.

14 years agoam 6fb8880a: Merge change I26a21669 into eclair
Raphael [Mon, 12 Oct 2009 19:44:21 +0000 (12:44 -0700)]
am 6fb8880a: Merge change I26a21669 into eclair

Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-plus-aosp

* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
  Set SDK Platform/Doc to API 5.

14 years agoam 6fb8880a: Merge change I26a21669 into eclair
Raphael [Mon, 12 Oct 2009 19:44:19 +0000 (12:44 -0700)]
am 6fb8880a: Merge change I26a21669 into eclair

Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-mr2

* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
  Set SDK Platform/Doc to API 5.

14 years agoam e3ec490a: am 211195d1: Merge change I0d2bc2d1 into eclair
Xavier Ducrohet [Mon, 12 Oct 2009 19:38:10 +0000 (12:38 -0700)]
am e3ec490a: am 211195d1: Merge change I0d2bc2d1 into eclair

Merge commit 'e3ec490a410978ee7bd5ce67b378974435e53a53'

* commit 'e3ec490a410978ee7bd5ce67b378974435e53a53':
  New based dialog class.

14 years agoam 86ff4a19: am 1121ceba: SDK: remove default.properties from ApiDemos
Raphael [Mon, 12 Oct 2009 19:37:42 +0000 (12:37 -0700)]
am 86ff4a19: am 1121ceba: SDK: remove default.properties from ApiDemos

Merge commit '86ff4a1905474bbcbef9b174013fe02740f78a0d'

* commit '86ff4a1905474bbcbef9b174013fe02740f78a0d':
  SDK: remove default.properties from ApiDemos

14 years agoam d53aa9b9: Add Conn Man testing tools.
Robert Greenwalt [Mon, 12 Oct 2009 19:36:32 +0000 (12:36 -0700)]
am d53aa9b9: Add Conn Man testing tools.

Merge commit 'd53aa9b917790c9f3480dd749b11707bd5c0f87a'

* commit 'd53aa9b917790c9f3480dd749b11707bd5c0f87a':
  Add Conn Man testing tools.

14 years agoMerge change I26a21669 into eclair
Android (Google) Code Review [Mon, 12 Oct 2009 19:36:08 +0000 (15:36 -0400)]
Merge change I26a21669 into eclair

* changes:
  Set SDK Platform/Doc to API 5.