Xavier Ducrohet
2e533cc044
am 05ae5d65: Merge change I229c60a9 into eclair
...
Merge commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-mr2
* commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
2009-11-15 14:50:44 -08:00
Android (Google) Code Review
05ae5d65fd
Merge change I229c60a9 into eclair
...
* changes:
Move source.properties for platform in sync with 2.0.1
2009-11-15 13:14:47 -08:00
Xavier Ducrohet
3423617276
Move source.properties for platform in sync with 2.0.1
...
Change-Id: I229c60a97138c70bb9b27bd0aa60670b882cb711
2009-11-15 12:52:56 -08:00
Raphael
1ef756940f
am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
...
Merge commit 'e5387db7c2dabc9954434494054295f45e86e312' into eclair-mr2
* commit 'e5387db7c2dabc9954434494054295f45e86e312':
SDK Manager: fix, create temp folder before download
2009-11-14 14:49:14 -08:00
Raphael
e5387db7c2
am d2ad5e31: Merge change I361fb688 into eclair-sdk
...
Merge commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair
* commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6':
SDK Manager: fix, create temp folder before download
2009-11-14 14:39:52 -08:00
Android (Google) Code Review
d2ad5e31b8
Merge change I361fb688 into eclair-sdk
...
* changes:
SDK Manager: fix, create temp folder before download
2009-11-14 14:32:27 -08:00
Brett Chabot
30a6db9cf3
am 36449a1e: Merge change Ic2680af0 into eclair
...
Merge commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b' into eclair-mr2
* commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b':
Cleanup for coverage.
2009-11-13 19:00:14 -08:00
Android (Google) Code Review
36449a1e14
Merge change Ic2680af0 into eclair
...
* changes:
Cleanup for coverage.
2009-11-13 18:55:47 -08:00
Brett Chabot
ddbd282dc8
Cleanup for coverage.
...
Fix constructor call in coverage.py
Remove obsolete improvider from coverage targets.
Change-Id: Ic2680af0aa84c705a6bc05a897461eeeaeeeb1cc
2009-11-13 18:33:43 -08:00
Eric Fischer
9c002e9f7a
am d5165a4b: Merge change I00c840bb into eclair
...
Merge commit 'd5165a4b6709a68fc099c8acdf4dfe4b7120adcf' into eclair-mr2
* commit 'd5165a4b6709a68fc099c8acdf4dfe4b7120adcf':
Import revised translations.
2009-11-13 17:54:56 -08:00
Android (Google) Code Review
d5165a4b67
Merge change I00c840bb into eclair
...
* changes:
Import revised translations.
2009-11-13 17:49:55 -08:00
Eric Fischer
00c840bbf4
Import revised translations.
...
Approver: jerryw
2009-11-13 17:11:59 -08:00
Xavier Ducrohet
37339c2afc
am b92c8a90: (-s ours) am 7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
Merge commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5' into eclair-mr2
* commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
2009-11-13 16:32:07 -08:00
Xavier Ducrohet
b92c8a9055
am 7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
Merge commit '7e48a7003ad28f8b45a45a24fc479b3a237727f1' into eclair
* commit '7e48a7003ad28f8b45a45a24fc479b3a237727f1':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
2009-11-13 16:27:51 -08:00
Xavier Ducrohet
7e48a7003a
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
BUG 2256562
This is integrated from eclair
2009-11-13 16:17:12 -08:00
Xavier Ducrohet
250153e825
am 25c6ac63: Merge change I9a181cb7 into eclair
...
Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-mr2
* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:46:56 -08:00
Android (Google) Code Review
25c6ac6391
Merge change I9a181cb7 into eclair
...
* changes:
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:42:46 -08:00
Android Git Automerger
228bbae1e3
am e259566c: Put this change back, false alert with build breakage
...
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
2009-11-13 13:06:11 -08:00
Android Git Automerger
e259566cef
Put this change back, false alert with build breakage
...
This reverts commit a9046e418e .
2009-11-13 12:26:06 -08:00
Android Git Automerger
0bf9cdf569
am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
...
Merge commit 'a9046e418e539e208af6f3723a513666074ec6a1' into eclair-mr2
* commit 'a9046e418e539e208af6f3723a513666074ec6a1':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
2009-11-13 11:50:47 -08:00
Android Git Automerger
a9046e418e
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
...
This reverts commit 18e1486a27 .
2009-11-13 11:40:40 -08:00
Jason Sams
0c0d7d25fd
am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
...
Merge commit '18e1486a2749055414579f487b125021eb79b8ca' into eclair-mr2
* commit '18e1486a2749055414579f487b125021eb79b8ca':
Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 23:07:33 -08:00
Raphael
3298a0438e
SDK Manager: fix, create temp folder before download
...
SDK BUG 2258237
Change-Id: I361fb688558539e20af50cd0a1d805ddf4ea4828
2009-11-12 17:15:54 -08:00
Jason Sams
18e1486a27
Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 15:08:27 -08:00
Xavier Ducrohet
75e9110f13
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
...
BUG 2256562
Change-Id: I9a181cb799b1eadc027d6357c100fc4dfb0db012
2009-11-12 13:30:02 -08:00
Brett Chabot
b2876c0c46
am cf87c98a: Add contacts launch performance test definition.
...
Merge commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f' into eclair-mr2
* commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f':
Add contacts launch performance test definition.
2009-11-12 12:04:10 -08:00
Xavier Ducrohet
7ec1c45b3a
am c84040c1: Merge change I6fd4cd01 into eclair
...
Merge commit 'c84040c18ba36b3b265f47a0a0366b33fd86c394' into eclair-mr2
* commit 'c84040c18ba36b3b265f47a0a0366b33fd86c394':
Add an overlay to make the latinIME the default one in the SDK
2009-11-12 12:04:06 -08:00
Brett Chabot
cf87c98ad1
Add contacts launch performance test definition.
...
Change-Id: I8d4376e676a682c59accbb129a4d77efb5696e28
2009-11-12 11:47:16 -08:00
Fred Quintana
c34c79fc66
am cf229bb0: make consistent with new RegisteredServicesCache API
...
Merge commit 'cf229bb013317db77034980c212ab07bea260261' into eclair-mr2
* commit 'cf229bb013317db77034980c212ab07bea260261':
make consistent with new RegisteredServicesCache API
2009-11-11 17:07:27 -08:00
Android (Google) Code Review
c84040c18b
Merge change I6fd4cd01 into eclair
...
* changes:
Add an overlay to make the latinIME the default one in the SDK
2009-11-11 11:20:09 -08:00
Xavier Ducrohet
d9750719c3
Add an overlay to make the latinIME the default one in the SDK
...
BUG 2225111
Change-Id: I6fd4cd0159f1eb90b78e3398a8e97d74d6396f9f
2009-11-10 18:14:11 -08:00
Fred Quintana
cf229bb013
make consistent with new RegisteredServicesCache API
2009-11-10 16:33:20 -08:00
Marco Nelissen
81515abca8
am 42c35199: Update live wallpaper examples to new api.
...
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-mr2
* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
2009-11-09 19:36:46 -08:00
Raphael
a7f3e75ebb
am 2d03b2a5: am 8ccddf4c: Merge change Id49751eb into eclair-sdk
...
Merge commit '2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e' into eclair-mr2
* commit '2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e':
SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 16:17:21 -08:00
Marco Nelissen
42c35199db
Update live wallpaper examples to new api.
2009-11-09 15:45:02 -08:00
Android (Google) Code Review
606fe5281d
Merge change Ib4a23918 into eclair-mr2
...
* changes:
Updating sample plugin to test java class loading.
2009-11-09 12:43:03 -08:00
Derek Sollenberger
b4a23918d3
Updating sample plugin to test java class loading.
2009-11-09 15:38:58 -05:00
Raphael
2d03b2a5d1
am 8ccddf4c: Merge change Id49751eb into eclair-sdk
...
Merge commit '8ccddf4c00464c6fee998d56da1f08b4662abf62' into eclair
* commit '8ccddf4c00464c6fee998d56da1f08b4662abf62':
SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 11:59:37 -08:00
Bjorn Bringert
e8b11328e2
am f702fa41: Merge change I53c8228b into eclair
...
Merge commit 'f702fa413273d175ba499bcb9bd352d208621d95' into eclair-mr2
* commit 'f702fa413273d175ba499bcb9bd352d208621d95':
Fix type of _id col in SearchableDictionary
2009-11-09 11:57:37 -08:00
Xavier Ducrohet
811d2c7507
am 7e56f226: Merge change I68a71c11 into eclair
...
Merge commit '7e56f226f745c2397b2cec4d0da1f61276e1b150' into eclair-mr2
* commit '7e56f226f745c2397b2cec4d0da1f61276e1b150':
Add Japanese font to SDK.
2009-11-09 11:57:33 -08:00
Brett Chabot
851c913b6e
am f765a70a: Update adt-tests build.properties to include new test data location.
...
Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-mr2
* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
Update adt-tests build.properties to include new test data location.
2009-11-09 11:57:18 -08:00
Android (Google) Code Review
f702fa4132
Merge change I53c8228b into eclair
...
* changes:
Fix type of _id col in SearchableDictionary
2009-11-09 08:58:40 -08:00
Android (Google) Code Review
7e56f226f7
Merge change I68a71c11 into eclair
...
* changes:
Add Japanese font to SDK.
2009-11-08 17:02:05 -08:00
Xavier Ducrohet
808c454132
Add Japanese font to SDK.
...
BUG 2041229
Change-Id: I68a71c11ae4f61c987a888dadf205f585b577c61
2009-11-08 15:17:25 -08:00
Brett Chabot
f765a70ac7
Update adt-tests build.properties to include new test data location.
...
Missed this file in the 31885 commit.
2009-11-08 13:46:35 -08:00
Android (Google) Code Review
8ccddf4c00
Merge change Id49751eb into eclair-sdk
...
* changes:
SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-08 13:34:15 -08:00
Brett Chabot
e458201d1a
am 534b520e: Merge change If5b2f9df into eclair
...
Merge commit '534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-mr2
* commit '534b520e4add964f75cf6a8a612b54916d46da2e':
Fix ADT test data references.
2009-11-07 12:49:46 -08:00
Android (Google) Code Review
534b520e4a
Merge change If5b2f9df into eclair
...
* changes:
Fix ADT test data references.
2009-11-07 15:40:26 -05:00
Raphael
28f6fda581
SDK Manager: reuse complete downloads, retry Windows locks.
...
This resolves 2 main issues with the SDK updater:
- Completed downloads are not cleared till the install is successful
- They are also stored in SDK/temp rather than the real Windows TEMP
folder, making them more discoverable for savvy users.
- There's a retry loop on failed install when due to a directory
being locked.
- The retry loop comes with the a Big Fat Warning[tm] in a modal
dialog box. You can't miss it. And it explicitly mentions the
antivirus software can be the root cause.
SDK BUG 2235058
Change-Id: Id49751ebd67e7291a0e7005136b22576335729c1
2009-11-06 19:04:28 -08:00
Raphael
a4ebc12213
am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
...
Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-mr2
* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:42:10 -08:00