Dianne Hackborn
5230a57c19
am a907a4f7: am 862eadb6: am a8baf9bc: Merge change Ie7eb359a into eclair
...
Merge commit 'a907a4f7a2660934f13da0fee32917947195c9c1'
* commit 'a907a4f7a2660934f13da0fee32917947195c9c1':
Tweaks to Pointer Location.
2009-10-14 18:39:34 -07:00
Dianne Hackborn
a907a4f7a2
am 862eadb6: am a8baf9bc: Merge change Ie7eb359a into eclair
...
Merge commit '862eadb62221429b9e2bb86dd6b7c9c61110e95b' into eclair-mr2-plus-aosp
* commit '862eadb62221429b9e2bb86dd6b7c9c61110e95b':
Tweaks to Pointer Location.
2009-10-14 18:30:21 -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
bd9637cf6f
am c193dc51: am 82bb67e5: am 8dd4e92c: Merge change I74fdf8c6 into eclair
...
Merge commit 'c193dc51052abb42ae9486855b50a3735aa9261d'
* commit 'c193dc51052abb42ae9486855b50a3735aa9261d':
2009-10-14 16:28:53 -07:00
David 'Digit' Turner
968a343332
am 1bda9e1a: am f9aa7764: am 7fe9c714: Merge change I3986492c into eclair
...
Merge commit '1bda9e1a5eb5c028f9439bf1a1869c6df25e78f4'
* commit '1bda9e1a5eb5c028f9439bf1a1869c6df25e78f4':
2009-10-14 16:28:49 -07:00
Jean-Baptiste Queru
fb105db46b
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.
2009-10-14 16:28:46 -07:00
Jean-Baptiste Queru
e02bfe56ba
am a7978d3b: merge from open-source master
...
Merge commit 'a7978d3bb0070495a9310dde4befa22a5b5ace4d'
* commit 'a7978d3bb0070495a9310dde4befa22a5b5ace4d':
2009-10-14 16:28:41 -07:00
Xavier Ducrohet
c193dc5105
am 82bb67e5: am 8dd4e92c: Merge change I74fdf8c6 into eclair
...
Merge commit '82bb67e55593074cc83123fe703e99c816463586' into eclair-mr2-plus-aosp
* commit '82bb67e55593074cc83123fe703e99c816463586':
2009-10-14 16:16:48 -07:00
David 'Digit' Turner
1bda9e1a5e
am f9aa7764: am 7fe9c714: Merge change I3986492c into eclair
...
Merge commit 'f9aa7764aabb10fc0b7abc9e72d27a38b2547b35' into eclair-mr2-plus-aosp
* commit 'f9aa7764aabb10fc0b7abc9e72d27a38b2547b35':
2009-10-14 16:16:43 -07:00
Jean-Baptiste Queru
b8f35789df
merge from open-source master
2009-10-14 16:12:05 -07:00
Xavier Ducrohet
4b7d624a64
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.
2009-10-14 16:07:23 -07:00
David 'Digit' Turner
4662ddee52
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.
2009-10-14 16:07:19 -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
Jean-Baptiste Queru
a7978d3bb0
merge from open-source master
2009-10-14 16:02:09 -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
Raphael
ab34bb51a9
am 5bb5b9ae: am 135ae886: Merge change Idad5a0ab into eclair
...
Merge commit '5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff'
* commit '5bb5b9ae1ec5aaba60c6da2bba8beb7dca4546ff':
SDK: Remove STOPSHIP keyword.
2009-10-14 15:35:16 -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
Raphael
5ce23b40e7
am 135ae886: Merge change Idad5a0ab into eclair
...
Merge commit '135ae88641599194c398cd5dbcee535313921f7a' into eclair-plus-aosp
* commit '135ae88641599194c398cd5dbcee535313921f7a':
SDK: Remove STOPSHIP keyword.
2009-10-14 12:26:57 -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
d2a6cedde8
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.
2009-10-14 11:58:49 -07:00
Raphael
74620545d2
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.
2009-10-14 11:39:54 -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
Android (Google) Code Review
e367f3fce8
Merge change I94f75699
...
* changes:
Reimport translations.
2009-10-14 13:02:18 -04:00
Xavier Ducrohet
f30cc73f37
am 861465a9: am e19c0298: Merge change Idc447b41 into eclair
...
Merge commit '861465a93c9634e1c2a345882ae71d0c3e21f4a2'
* commit '861465a93c9634e1c2a345882ae71d0c3e21f4a2':
UI to manage/create custom Layout Devices.
2009-10-14 07:56:14 -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
Xavier Ducrohet
3f61033c38
am e19c0298: Merge change Idc447b41 into eclair
...
Merge commit 'e19c02984fd10c9fa35b036aafc1181cb8384069' into eclair-plus-aosp
* commit 'e19c02984fd10c9fa35b036aafc1181cb8384069':
UI to manage/create custom Layout Devices.
2009-10-13 22:57:57 -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
c298b5a013
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.
2009-10-13 21:05:12 -07:00
Xavier Ducrohet
91e5979865
am 37f35fdc: am bc7c3672: Merge change I6dbcafab into eclair
...
Merge commit '37f35fdca099beabcef9220b809c42c7567c9749'
* commit '37f35fdca099beabcef9220b809c42c7567c9749':
Fix NPE in the parsing of property file.
2009-10-13 21:05:07 -07:00
Xavier Ducrohet
d18f57f976
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.
2009-10-13 20:47:22 -07:00
Xavier Ducrohet
1225b9c500
am bc7c3672: Merge change I6dbcafab into eclair
...
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-plus-aosp
* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
Fix NPE in the parsing of property file.
2009-10-13 20:47:17 -07: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
Derek Sollenberger
60bee9c342
am 60e45099: Merge change Ibb660dd5 into eclair-mr2
...
Merge commit '60e45099aa404686c3b6d38187306fe5bb90cd8f'
* commit '60e45099aa404686c3b6d38187306fe5bb90cd8f':
updating sample plugins to support fixed surface dimensions.
2009-10-13 17:08:26 -07:00
Raphael
ab2d129a89
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.
2009-10-13 17:06:06 -07:00
Raphael
532dd1b213
am 46ab498e: am 9bdf821f: SDK: Support "android.bat update sdk"
...
Merge commit '46ab498e50ba71467c71ebe14784706148554b86'
* commit '46ab498e50ba71467c71ebe14784706148554b86':
SDK: Support "android.bat update sdk"
2009-10-13 17:03:58 -07:00
Raphael
1c8693f447
am acadcaca: am 5ca98eb0: Merge change I5359971f into eclair
...
Merge commit 'acadcaca51b8bedaaa8b188c8800ffc323d0bd06'
* commit 'acadcaca51b8bedaaa8b188c8800ffc323d0bd06':
New "SDK Launcher" for Windows.
2009-10-13 17:03:26 -07:00
Raphael
f09d25e5f9
am 8583fb38: am 6fb8880a: Merge change I26a21669 into eclair
...
Merge commit '8583fb381bf2bedee8efa85abda42673ba9f7a9c'
* commit '8583fb381bf2bedee8efa85abda42673ba9f7a9c':
Set SDK Platform/Doc to API 5.
2009-10-13 17:02:21 -07:00
Raphael
ae827df5e8
am 7dcaccf3: am e4c98c01: SDK Manager: display packages revisions
...
Merge commit '7dcaccf359f25586218d33a28cd05ad81af43fb1'
* commit '7dcaccf359f25586218d33a28cd05ad81af43fb1':
SDK Manager: display packages revisions
2009-10-13 16:57:25 -07:00
Raphael
aec2e11fca
am d3fb418c: am e7ad6a5e: Merge change I2fb42327 into eclair
...
Merge commit 'd3fb418c7c82c47c0b2c1d9b5383d4aca428252f'
* commit 'd3fb418c7c82c47c0b2c1d9b5383d4aca428252f':
SDK Manager: extra packages must respect min-tools-rev too.
2009-10-13 16:57:21 -07:00