OSDN Git Service
Xavier Ducrohet [Sun, 15 Nov 2009 23:01:04 +0000 (15:01 -0800)]
am
aab6b89d: am
2e533cc0: am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
aab6b89debd56304b2fdde39292f36149a11f728'
* commit '
aab6b89debd56304b2fdde39292f36149a11f728':
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:55:10 +0000 (14:55 -0800)]
am
2e533cc0: am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
2e533cc0448af6e2add7ab346ff451dde79c1ced' into eclair-mr2-plus-aosp
* commit '
2e533cc0448af6e2add7ab346ff451dde79c1ced':
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:50:44 +0000 (14:50 -0800)]
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
Android (Google) Code Review [Sun, 15 Nov 2009 22:07:51 +0000 (14:07 -0800)]
Merge change Ia9788cd9
* changes:
Cleaning up source.android.com files.
Android (Google) Code Review [Sun, 15 Nov 2009 21:14:47 +0000 (13:14 -0800)]
Merge change I229c60a9 into eclair
* changes:
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 20:52:56 +0000 (12:52 -0800)]
Move source.properties for platform in sync with 2.0.1
Change-Id: I229c60a97138c70bb9b27bd0aa60670b882cb711
Dan Morrill [Sun, 15 Nov 2009 19:49:30 +0000 (11:49 -0800)]
Cleaning up source.android.com files.
This change fixes some formatting artifacts that resulted from the export from
Sites, and also updates links to no longer point to Sites and use the standard
{@docRoot} idiom. Also contains a few content updates, and introduces a page
about branch management.
Raphael [Sat, 14 Nov 2009 23:01:55 +0000 (15:01 -0800)]
am
30f366d2: am
1ef75694: am
e5387db7: am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
30f366d23217cb71181353010464e99c9b42115f'
* commit '
30f366d23217cb71181353010464e99c9b42115f':
SDK Manager: fix, create temp folder before download
Raphael [Sat, 14 Nov 2009 22:55:28 +0000 (14:55 -0800)]
am
1ef75694: am
e5387db7: am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
1ef756940f7292987a32eeab656fc8737171dc03' into eclair-mr2-plus-aosp
* commit '
1ef756940f7292987a32eeab656fc8737171dc03':
SDK Manager: fix, create temp folder before download
Raphael [Sat, 14 Nov 2009 22:49:14 +0000 (14:49 -0800)]
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
Raphael [Sat, 14 Nov 2009 22:39:52 +0000 (14:39 -0800)]
am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
d2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair
* commit '
d2ad5e31b829f609c76f2352cbdb964c0a4434e6':
SDK Manager: fix, create temp folder before download
Android (Google) Code Review [Sat, 14 Nov 2009 22:32:27 +0000 (14:32 -0800)]
Merge change I361fb688 into eclair-sdk
* changes:
SDK Manager: fix, create temp folder before download
Brett Chabot [Sat, 14 Nov 2009 03:06:44 +0000 (19:06 -0800)]
Brett Chabot [Sat, 14 Nov 2009 03:03:51 +0000 (19:03 -0800)]
am
30a6db9c: am
36449a1e: Merge change Ic2680af0 into eclair
Merge commit '
30a6db9cf31c95a6329170dfd5de2e27cfe47b16' into eclair-mr2-plus-aosp
* commit '
30a6db9cf31c95a6329170dfd5de2e27cfe47b16':
Cleanup for coverage.
Brett Chabot [Sat, 14 Nov 2009 03:00:14 +0000 (19:00 -0800)]
am
36449a1e: Merge change Ic2680af0 into eclair
Merge commit '
36449a1e14b91a25ae6b3746cb8b1387d2b8157b' into eclair-mr2
* commit '
36449a1e14b91a25ae6b3746cb8b1387d2b8157b':
Cleanup for coverage.
Android (Google) Code Review [Sat, 14 Nov 2009 02:55:47 +0000 (18:55 -0800)]
Merge change Ic2680af0 into eclair
* changes:
Cleanup for coverage.
Brett Chabot [Sat, 14 Nov 2009 02:33:43 +0000 (18:33 -0800)]
Cleanup for coverage.
Fix constructor call in coverage.py
Remove obsolete improvider from coverage targets.
Change-Id: Ic2680af0aa84c705a6bc05a897461eeeaeeeb1cc
Eric Fischer [Sat, 14 Nov 2009 02:03:40 +0000 (18:03 -0800)]
am
60f045e3: am
9c002e9f: am
d5165a4b: Merge change I00c840bb into eclair
Merge commit '
60f045e3b3fb49bceb85389fdaadcaa8b6e17ee6'
* commit '
60f045e3b3fb49bceb85389fdaadcaa8b6e17ee6':
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:59:44 +0000 (17:59 -0800)]
am
9c002e9f: am
d5165a4b: Merge change I00c840bb into eclair
Merge commit '
9c002e9f7a90a769b0656e060d4ec6a0401d7927' into eclair-mr2-plus-aosp
* commit '
9c002e9f7a90a769b0656e060d4ec6a0401d7927':
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:54:56 +0000 (17:54 -0800)]
am
d5165a4b: Merge change I00c840bb into eclair
Merge commit '
d5165a4b6709a68fc099c8acdf4dfe4b7120adcf' into eclair-mr2
* commit '
d5165a4b6709a68fc099c8acdf4dfe4b7120adcf':
Import revised translations.
Android (Google) Code Review [Sat, 14 Nov 2009 01:49:55 +0000 (17:49 -0800)]
Merge change I00c840bb into eclair
* changes:
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:11:59 +0000 (17:11 -0800)]
Import revised translations.
Approver: jerryw
Xavier Ducrohet [Sat, 14 Nov 2009 00:41:32 +0000 (16:41 -0800)]
am
1591827e: (-s ours) am
37339c2a: 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 '
1591827e470544eff8057b61c0be51acb8b57b95'
* commit '
1591827e470544eff8057b61c0be51acb8b57b95':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Sat, 14 Nov 2009 00:35:35 +0000 (16:35 -0800)]
am
37339c2a: 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 '
37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a' into eclair-mr2-plus-aosp
* commit '
37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Sat, 14 Nov 2009 00:32:07 +0000 (16:32 -0800)]
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)
Xavier Ducrohet [Sat, 14 Nov 2009 00:27:51 +0000 (16:27 -0800)]
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)
Xavier Ducrohet [Thu, 12 Nov 2009 21:25:09 +0000 (13:25 -0800)]
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
BUG
2256562
This is integrated from eclair
Xavier Ducrohet [Fri, 13 Nov 2009 23:54:50 +0000 (15:54 -0800)]
am
d4929cfa: am
250153e8: am
25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '
d4929cfa19edd45f5b819400c5e221a2687a294d'
* commit '
d4929cfa19edd45f5b819400c5e221a2687a294d':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Xavier Ducrohet [Fri, 13 Nov 2009 23:50:56 +0000 (15:50 -0800)]
am
250153e8: am
25c6ac63: Merge change I9a181cb7 into eclair
Merge commit '
250153e8257188269bb171bb333975860bcc1d36' into eclair-mr2-plus-aosp
* commit '
250153e8257188269bb171bb333975860bcc1d36':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Xavier Ducrohet [Fri, 13 Nov 2009 23:46:56 +0000 (15:46 -0800)]
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+
Android (Google) Code Review [Fri, 13 Nov 2009 23:42:46 +0000 (15:42 -0800)]
Merge change I9a181cb7 into eclair
* changes:
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Android (Google) Code Review [Fri, 13 Nov 2009 23:31:49 +0000 (15:31 -0800)]
Merge change I9bdf6690
* changes:
Forces adb root and remount when syncing.
Android (Google) Code Review [Fri, 13 Nov 2009 23:31:23 +0000 (15:31 -0800)]
Merge change If6f5beaf
* changes:
Improved the search to catch warnings from the build subprocess.
Android Git Automerger [Fri, 13 Nov 2009 21:15:32 +0000 (13:15 -0800)]
am
fc6e75e5: am
228bbae1: am
e259566c: Put this change back, false alert with build breakage
Merge commit '
fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0'
* commit '
fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0':
Put this change back, false alert with build breakage
Android Git Automerger [Fri, 13 Nov 2009 21:11:09 +0000 (13:11 -0800)]
am
228bbae1: am
e259566c: Put this change back, false alert with build breakage
Merge commit '
228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp
* commit '
228bbae1e312c525f52648d2ff4f4ed597d82a7b':
Put this change back, false alert with build breakage
Android Git Automerger [Fri, 13 Nov 2009 21:06:11 +0000 (13:06 -0800)]
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
Android Git Automerger [Fri, 13 Nov 2009 20:26:06 +0000 (12:26 -0800)]
Put this change back, false alert with build breakage
This reverts commit
a9046e418e539e208af6f3723a513666074ec6a1.
Android Git Automerger [Fri, 13 Nov 2009 19:58:41 +0000 (11:58 -0800)]
am
2c97ad64: am
0bf9cdf5: am
a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
Merge commit '
2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d'
* commit '
2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
Android Git Automerger [Fri, 13 Nov 2009 19:55:32 +0000 (11:55 -0800)]
am
0bf9cdf5: am
a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
Merge commit '
0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb' into eclair-mr2-plus-aosp
* commit '
0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
Android Git Automerger [Fri, 13 Nov 2009 19:50:47 +0000 (11:50 -0800)]
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."
Android Git Automerger [Fri, 13 Nov 2009 19:40:40 +0000 (11:40 -0800)]
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
This reverts commit
18e1486a2749055414579f487b125021eb79b8ca.
Nicolas Catania [Fri, 13 Nov 2009 18:02:10 +0000 (10:02 -0800)]
Forces adb root and remount when syncing.
The time it takes is very small to do these 2 operations.
Then sync never fails, even on the a device that has just rebooted.
Nicolas Catania [Fri, 13 Nov 2009 17:52:18 +0000 (09:52 -0800)]
Improved the search to catch warnings from the build subprocess.
The build subprocess' output is buffered (but not line buffered).
As a result partial lines are inserted. If the previous insert ended
in the middle of the pattern we are looking for, the search will fail (end missing).
When the second part is inserted, the search will also fail because this
time we start looking from the middle of the pattern (beginning missing).
To work around that, we always match from the beginning of the line.
Jason Sams [Fri, 13 Nov 2009 07:20:39 +0000 (23:20 -0800)]
am
5a571291: am
0c0d7d25: am
18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
Merge commit '
5a571291d38723cc4789bd864b24aa7009b642e6'
* commit '
5a571291d38723cc4789bd864b24aa7009b642e6':
Remove surface from rs init and handle surfaceChanged correctly.
Jason Sams [Fri, 13 Nov 2009 07:14:43 +0000 (23:14 -0800)]
am
0c0d7d25: am
18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
Merge commit '
0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5' into eclair-mr2-plus-aosp
* commit '
0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5':
Remove surface from rs init and handle surfaceChanged correctly.
Jason Sams [Fri, 13 Nov 2009 07:07:33 +0000 (23:07 -0800)]
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.
Raphael [Fri, 13 Nov 2009 01:15:54 +0000 (17:15 -0800)]
SDK Manager: fix, create temp folder before download
SDK BUG
2258237
Change-Id: I361fb688558539e20af50cd0a1d805ddf4ea4828
Jason Sams [Thu, 12 Nov 2009 22:10:30 +0000 (14:10 -0800)]
Remove surface from rs init and handle surfaceChanged correctly.
Xavier Ducrohet [Thu, 12 Nov 2009 21:25:09 +0000 (13:25 -0800)]
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
BUG
2256562
Change-Id: I9a181cb799b1eadc027d6357c100fc4dfb0db012
Brett Chabot [Thu, 12 Nov 2009 20:13:15 +0000 (12:13 -0800)]
am
ca603e23: am
b2876c0c: am
cf87c98a: Add contacts launch performance test definition.
Merge commit '
ca603e23d3f279e261b85ea18626ddf8679ffef7'
* commit '
ca603e23d3f279e261b85ea18626ddf8679ffef7':
Add contacts launch performance test definition.
Xavier Ducrohet [Thu, 12 Nov 2009 20:13:10 +0000 (12:13 -0800)]
am
0034543d: am
7ec1c45b: am
c84040c1: Merge change I6fd4cd01 into eclair
Merge commit '
0034543d232dea5a1837411b62bedfd51468c9dc'
* commit '
0034543d232dea5a1837411b62bedfd51468c9dc':
Add an overlay to make the latinIME the default one in the SDK
Brett Chabot [Thu, 12 Nov 2009 20:08:18 +0000 (12:08 -0800)]
am
b2876c0c: am
cf87c98a: Add contacts launch performance test definition.
Merge commit '
b2876c0c46107aadabd0ccc2f1b10c04f4c2f169' into eclair-mr2-plus-aosp
* commit '
b2876c0c46107aadabd0ccc2f1b10c04f4c2f169':
Add contacts launch performance test definition.
Xavier Ducrohet [Thu, 12 Nov 2009 20:08:14 +0000 (12:08 -0800)]
am
7ec1c45b: am
c84040c1: Merge change I6fd4cd01 into eclair
Merge commit '
7ec1c45b3ae47e9c9dc594f1478f22ae49cbd0a4' into eclair-mr2-plus-aosp
* commit '
7ec1c45b3ae47e9c9dc594f1478f22ae49cbd0a4':
Add an overlay to make the latinIME the default one in the SDK
Brett Chabot [Thu, 12 Nov 2009 20:04:10 +0000 (12:04 -0800)]
am
cf87c98a: Add contacts launch performance test definition.
Merge commit '
cf87c98ad18bdf928dd93a86e04b0f61b477a30f' into eclair-mr2
* commit '
cf87c98ad18bdf928dd93a86e04b0f61b477a30f':
Add contacts launch performance test definition.
Xavier Ducrohet [Thu, 12 Nov 2009 20:04:06 +0000 (12:04 -0800)]
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
Brett Chabot [Thu, 12 Nov 2009 19:47:16 +0000 (11:47 -0800)]
Add contacts launch performance test definition.
Change-Id: I8d4376e676a682c59accbb129a4d77efb5696e28
Jack Palevich [Thu, 12 Nov 2009 06:42:00 +0000 (14:42 +0800)]
Remove duplicate vpn path entries.
Fred Quintana [Thu, 12 Nov 2009 01:35:22 +0000 (17:35 -0800)]
am
864f49d8: am
c34c79fc: am
cf229bb0: make consistent with new RegisteredServicesCache API
Merge commit '
864f49d8e9b5bd2a30ac8414822889d0ffd0ba0c'
* commit '
864f49d8e9b5bd2a30ac8414822889d0ffd0ba0c':
make consistent with new RegisteredServicesCache API
Fred Quintana [Thu, 12 Nov 2009 01:24:03 +0000 (17:24 -0800)]
am
c34c79fc: am
cf229bb0: make consistent with new RegisteredServicesCache API
Merge commit '
c34c79fc6627329f1c9586d51524d95d57022aaf' into eclair-mr2-plus-aosp
* commit '
c34c79fc6627329f1c9586d51524d95d57022aaf':
make consistent with new RegisteredServicesCache API
Fred Quintana [Thu, 12 Nov 2009 01:07:27 +0000 (17:07 -0800)]
am
cf229bb0: make consistent with new RegisteredServicesCache API
Merge commit '
cf229bb013317db77034980c212ab07bea260261' into eclair-mr2
* commit '
cf229bb013317db77034980c212ab07bea260261':
make consistent with new RegisteredServicesCache API
Android (Google) Code Review [Wed, 11 Nov 2009 19:20:09 +0000 (11:20 -0800)]
Merge change I6fd4cd01 into eclair
* changes:
Add an overlay to make the latinIME the default one in the SDK
Xavier Ducrohet [Wed, 11 Nov 2009 02:14:11 +0000 (18:14 -0800)]
Add an overlay to make the latinIME the default one in the SDK
BUG
2225111
Change-Id: I6fd4cd0159f1eb90b78e3398a8e97d74d6396f9f
Fred Quintana [Mon, 9 Nov 2009 23:47:36 +0000 (15:47 -0800)]
make consistent with new RegisteredServicesCache API
Marco Nelissen [Tue, 10 Nov 2009 03:44:11 +0000 (19:44 -0800)]
am
0badc7f8: am
81515abc: am
42c35199: Update live wallpaper examples to new api.
Merge commit '
0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a'
* commit '
0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a':
Update live wallpaper examples to new api.
Marco Nelissen [Tue, 10 Nov 2009 03:40:25 +0000 (19:40 -0800)]
am
81515abc: am
42c35199: Update live wallpaper examples to new api.
Merge commit '
81515abca85e742584db3c7cdacc5b840f0eb650' into eclair-mr2-plus-aosp
* commit '
81515abca85e742584db3c7cdacc5b840f0eb650':
Update live wallpaper examples to new api.
Marco Nelissen [Tue, 10 Nov 2009 03:36:46 +0000 (19:36 -0800)]
am
42c35199: Update live wallpaper examples to new api.
Merge commit '
42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-mr2
* commit '
42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
Raphael [Tue, 10 Nov 2009 00:33:25 +0000 (16:33 -0800)]
am
d4f5e0a9: am
a7f3e75e: am
2d03b2a5: am
8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '
d4f5e0a9ddb2c2e1020a463f320af65508edf039'
* commit '
d4f5e0a9ddb2c2e1020a463f320af65508edf039':
SDK Manager: reuse complete downloads, retry Windows locks.
Raphael [Tue, 10 Nov 2009 00:23:29 +0000 (16:23 -0800)]
am
a7f3e75e: am
2d03b2a5: am
8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '
a7f3e75ebb849bff947d12b3be24145c4cb9de9a' into eclair-mr2-plus-aosp
* commit '
a7f3e75ebb849bff947d12b3be24145c4cb9de9a':
SDK Manager: reuse complete downloads, retry Windows locks.
Raphael [Tue, 10 Nov 2009 00:17:21 +0000 (16:17 -0800)]
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.
Marco Nelissen [Mon, 9 Nov 2009 23:45:02 +0000 (15:45 -0800)]
Update live wallpaper examples to new api.
Android (Google) Code Review [Mon, 9 Nov 2009 23:09:53 +0000 (15:09 -0800)]
Merge change I5856aaca
* changes:
Forgot to remove now-obsolete PDK files in last commit.
Derek Sollenberger [Mon, 9 Nov 2009 22:14:38 +0000 (14:14 -0800)]
am
c3e07f9d: am
606fe528: Merge change Ib4a23918 into eclair-mr2
Merge commit '
c3e07f9d442ba097f264777693938b781e290da4'
* commit '
c3e07f9d442ba097f264777693938b781e290da4':
Updating sample plugin to test java class loading.
Bjorn Bringert [Mon, 9 Nov 2009 21:48:57 +0000 (13:48 -0800)]
am
f9e27790: am
e8b11328: am
f702fa41: Merge change I53c8228b into eclair
Merge commit '
f9e27790ebed44735b28ba23c3f95f21c6f30743'
* commit '
f9e27790ebed44735b28ba23c3f95f21c6f30743':
Fix type of _id col in SearchableDictionary
Xavier Ducrohet [Mon, 9 Nov 2009 21:48:53 +0000 (13:48 -0800)]
am
538ff70d: am
811d2c75: am
7e56f226: Merge change I68a71c11 into eclair
Merge commit '
538ff70d5f3fd450c9d0b2ac4a6333fa6ff277ed'
* commit '
538ff70d5f3fd450c9d0b2ac4a6333fa6ff277ed':
Add Japanese font to SDK.
Brett Chabot [Mon, 9 Nov 2009 21:48:44 +0000 (13:48 -0800)]
am
11ea938d: am
851c913b: am
f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit '
11ea938d2ad7227945204aa2d93dc96401a0fdba'
* commit '
11ea938d2ad7227945204aa2d93dc96401a0fdba':
Update adt-tests build.properties to include new test data location.
Derek Sollenberger [Mon, 9 Nov 2009 20:47:14 +0000 (12:47 -0800)]
am
606fe528: Merge change Ib4a23918 into eclair-mr2
Merge commit '
606fe5281d830a6f4eb7ba36bf7127eb3b8cd934' into eclair-mr2-plus-aosp
* commit '
606fe5281d830a6f4eb7ba36bf7127eb3b8cd934':
Updating sample plugin to test java class loading.
Android (Google) Code Review [Mon, 9 Nov 2009 20:43:03 +0000 (12:43 -0800)]
Merge change Ib4a23918 into eclair-mr2
* changes:
Updating sample plugin to test java class loading.
Derek Sollenberger [Mon, 9 Nov 2009 20:38:58 +0000 (15:38 -0500)]
Updating sample plugin to test java class loading.
Bjorn Bringert [Mon, 9 Nov 2009 20:14:29 +0000 (12:14 -0800)]
am
e8b11328: am
f702fa41: Merge change I53c8228b into eclair
Merge commit '
e8b11328e22d4e187e195753f1aacb59c5e30179' into eclair-mr2-plus-aosp
* commit '
e8b11328e22d4e187e195753f1aacb59c5e30179':
Fix type of _id col in SearchableDictionary
Xavier Ducrohet [Mon, 9 Nov 2009 20:14:25 +0000 (12:14 -0800)]
am
811d2c75: am
7e56f226: Merge change I68a71c11 into eclair
Merge commit '
811d2c7507b03f04391c7b21e0de795c6ad12f5d' into eclair-mr2-plus-aosp
* commit '
811d2c7507b03f04391c7b21e0de795c6ad12f5d':
Add Japanese font to SDK.
Brett Chabot [Mon, 9 Nov 2009 20:14:20 +0000 (12:14 -0800)]
am
851c913b: am
f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit '
851c913b6e3cdf7cb334d4b24ae3e1079554203b' into eclair-mr2-plus-aosp
* commit '
851c913b6e3cdf7cb334d4b24ae3e1079554203b':
Update adt-tests build.properties to include new test data location.
Jean-Baptiste Queru [Mon, 9 Nov 2009 20:03:40 +0000 (12:03 -0800)]
am
515a94b2: merge from open-source master
Merge commit '
515a94b25aece44c87c4f8ee48bea82690a2ba57'
* commit '
515a94b25aece44c87c4f8ee48bea82690a2ba57':
Tweaks to sample .classpath to reduce errors.
Raphael [Mon, 9 Nov 2009 19:59:37 +0000 (11:59 -0800)]
am
8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '
8ccddf4c00464c6fee998d56da1f08b4662abf62' into eclair
* commit '
8ccddf4c00464c6fee998d56da1f08b4662abf62':
SDK Manager: reuse complete downloads, retry Windows locks.
Bjorn Bringert [Mon, 9 Nov 2009 19:57:37 +0000 (11:57 -0800)]
am
f702fa41: Merge change I53c8228b into eclair
Merge commit '
f702fa413273d175ba499bcb9bd352d208621d95' into eclair-mr2
* commit '
f702fa413273d175ba499bcb9bd352d208621d95':
Fix type of _id col in SearchableDictionary
Xavier Ducrohet [Mon, 9 Nov 2009 19:57:33 +0000 (11:57 -0800)]
am
7e56f226: Merge change I68a71c11 into eclair
Merge commit '
7e56f226f745c2397b2cec4d0da1f61276e1b150' into eclair-mr2
* commit '
7e56f226f745c2397b2cec4d0da1f61276e1b150':
Add Japanese font to SDK.
Brett Chabot [Mon, 9 Nov 2009 19:57:18 +0000 (11:57 -0800)]
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.
Dan Morrill [Mon, 9 Nov 2009 18:13:58 +0000 (10:13 -0800)]
Forgot to remove now-obsolete PDK files in last commit.
Android (Google) Code Review [Mon, 9 Nov 2009 16:58:40 +0000 (08:58 -0800)]
Merge change I53c8228b into eclair
* changes:
Fix type of _id col in SearchableDictionary
Android (Google) Code Review [Mon, 9 Nov 2009 16:07:16 +0000 (08:07 -0800)]
Merge change I3cd199f9
* changes:
Work-in-progress snapshot of the source.android.com (formerly PDK) site refresh.
Jean-Baptiste Queru [Mon, 9 Nov 2009 16:04:49 +0000 (08:04 -0800)]
merge from open-source master
Android (Google) Code Review [Mon, 9 Nov 2009 01:02:05 +0000 (17:02 -0800)]
Merge change I68a71c11 into eclair
* changes:
Add Japanese font to SDK.
Xavier Ducrohet [Sun, 8 Nov 2009 23:15:37 +0000 (15:15 -0800)]
Add Japanese font to SDK.
BUG
2041229
Change-Id: I68a71c11ae4f61c987a888dadf205f585b577c61
Brett Chabot [Sun, 8 Nov 2009 21:46:35 +0000 (13:46 -0800)]
Update adt-tests build.properties to include new test data location.
Missed this file in the 31885 commit.
Android (Google) Code Review [Sun, 8 Nov 2009 21:34:15 +0000 (13:34 -0800)]
Merge change Id49751eb into eclair-sdk
* changes:
SDK Manager: reuse complete downloads, retry Windows locks.
Brett Chabot [Sat, 7 Nov 2009 21:08:39 +0000 (13:08 -0800)]
am
c35d9654: am
e458201d: am
534b520e: Merge change If5b2f9df into eclair
Merge commit '
c35d96542787333ee87b4b356aa499a64cdc78d7'
* commit '
c35d96542787333ee87b4b356aa499a64cdc78d7':
Fix ADT test data references.
Brett Chabot [Sat, 7 Nov 2009 20:59:10 +0000 (12:59 -0800)]
am
e458201d: am
534b520e: Merge change If5b2f9df into eclair
Merge commit '
e458201d1ab45d9b72027d3d319d16810bf0b94f' into eclair-mr2-plus-aosp
* commit '
e458201d1ab45d9b72027d3d319d16810bf0b94f':
Fix ADT test data references.
Brett Chabot [Sat, 7 Nov 2009 20:49:46 +0000 (12:49 -0800)]
am
534b520e: Merge change If5b2f9df into eclair
Merge commit '
534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-mr2
* commit '
534b520e4add964f75cf6a8a612b54916d46da2e':
Fix ADT test data references.
Android (Google) Code Review [Sat, 7 Nov 2009 20:40:26 +0000 (15:40 -0500)]
Merge change If5b2f9df into eclair
* changes:
Fix ADT test data references.
Raphael [Sat, 7 Nov 2009 02:55:04 +0000 (18:55 -0800)]
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
Raphael [Sat, 7 Nov 2009 01:00:35 +0000 (17:00 -0800)]
am
d80d98a5: am
a4ebc122: am
3de25903: am
8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '
d80d98a5591a68fff9f02b768a08c0e1076aa36c'
* commit '
d80d98a5591a68fff9f02b768a08c0e1076aa36c':
SDK Manager: refresh sources when HTTP/S pref is changed.