OSDN Git Service
Xavier Ducrohet [Sun, 15 Nov 2009 22:50:49 +0000 (14:50 -0800)]
am
13dbc227: Merge change I62823795 into eclair
Merge commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-mr2
* commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc 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 21:22:41 +0000 (13:22 -0800)]
Merge change I62823795 into eclair
* changes:
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 21:16:01 +0000 (13:16 -0800)]
Move source.properties for doc in sync with 2.0.1
Change-Id: I6282379532159de597aaec50cad81b14a0c895ce
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
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: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 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: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: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 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: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.
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: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
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: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: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 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.
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.
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 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 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 00:42:10 +0000 (16:42 -0800)]
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.
Raphael [Sat, 7 Nov 2009 00:13:41 +0000 (16:13 -0800)]
am
8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '
8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair
* commit '
8e3442f1b0fc19c8213978d4e7ac005774462297':
SDK Manager: refresh sources when HTTP/S pref is changed.
Android (Google) Code Review [Sat, 7 Nov 2009 00:06:48 +0000 (19:06 -0500)]
Merge change Ic291d534 into eclair-sdk
* changes:
SDK Manager: refresh sources when HTTP/S pref is changed.
Raphael [Fri, 6 Nov 2009 23:18:57 +0000 (15:18 -0800)]
SDK Manager: refresh sources when HTTP/S pref is changed.
Currently you need to use the Refresh button in the remote page
after you change the HTTP/s setting and many users think
instead they need to close/restart the SDK manager.
Change-Id: Ic291d53459624558910bbc417295df5ddc7b037d
Raphael [Fri, 6 Nov 2009 22:08:28 +0000 (14:08 -0800)]
am
bf9a70fb: am
ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '
bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-mr2
* commit '
bf9a70fb1beb15944cb47d267c7b15ab699dca63':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Raphael [Fri, 6 Nov 2009 22:00:55 +0000 (14:00 -0800)]
am
ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '
ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair
* commit '
ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Raphael [Fri, 6 Nov 2009 21:42:28 +0000 (13:42 -0800)]
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d
Xavier Ducrohet [Fri, 6 Nov 2009 19:15:38 +0000 (11:15 -0800)]
am
396a10e4: Merge change I793a35a9 into eclair
Merge commit '
396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2
* commit '
396a10e48d7201215e54821fa0d7901ffde3a30a':
ADT now launches app as if launched from launcher.
Android (Google) Code Review [Fri, 6 Nov 2009 19:08:24 +0000 (14:08 -0500)]
Merge change I793a35a9 into eclair
* changes:
ADT now launches app as if launched from launcher.
Xavier Ducrohet [Fri, 6 Nov 2009 02:38:04 +0000 (18:38 -0800)]
ADT now launches app as if launched from launcher.
BUG
2243142
Change-Id: I793a35a92cf0f818242e74e4794d74a681b25d83
Xavier Ducrohet [Fri, 6 Nov 2009 18:26:37 +0000 (10:26 -0800)]
am
7853d243: Merge change I1fa1ae88 into eclair
Merge commit '
7853d243aa0f2947249aa610972d74622cdddd82' into eclair-mr2
* commit '
7853d243aa0f2947249aa610972d74622cdddd82':
Move Tools to rev 5, and ADT to 0.9.5
Android (Google) Code Review [Fri, 6 Nov 2009 18:15:45 +0000 (13:15 -0500)]
Merge change I1fa1ae88 into eclair
* changes:
Move Tools to rev 5, and ADT to 0.9.5
Xavier Ducrohet [Fri, 6 Nov 2009 18:05:53 +0000 (10:05 -0800)]
Move Tools to rev 5, and ADT to 0.9.5
Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445
Fred Quintana [Thu, 5 Nov 2009 21:53:36 +0000 (13:53 -0800)]
am
b5723869: Merge change I85aa2b1d into eclair
Merge commit '
b57238690e7e4afa66416e3ad25183a576f35075' into eclair-mr2
* commit '
b57238690e7e4afa66416e3ad25183a576f35075':
create a test app that allows direct control of a sync adapter for testing purposes
Android (Google) Code Review [Thu, 5 Nov 2009 21:50:10 +0000 (16:50 -0500)]
Merge change I4d2a57bc into eclair-mr2
* changes:
Moved values into attributes of xml elements where they belong
Android (Google) Code Review [Thu, 5 Nov 2009 19:16:08 +0000 (14:16 -0500)]
Merge change I85aa2b1d into eclair
* changes:
create a test app that allows direct control of a sync adapter for testing purposes
Fred Quintana [Wed, 4 Nov 2009 01:18:33 +0000 (17:18 -0800)]
create a test app that allows direct control of a sync adapter for testing purposes
http://b/issue?id=
2239791
Xavier Ducrohet [Wed, 4 Nov 2009 23:15:19 +0000 (15:15 -0800)]
am
421e8d33: (-s ours) am
7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '
421e8d3353de606444e5350d8feeee8c01c90394' into eclair-mr2
* commit '
421e8d3353de606444e5350d8feeee8c01c90394':
Ignore hidden files and vi swap files during packaging. (do not merge)
Xavier Ducrohet [Wed, 4 Nov 2009 23:05:34 +0000 (15:05 -0800)]
am
7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '
7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair
* commit '
7f305ce77069cf8432374f12392a3ce3a476bdce':
Ignore hidden files and vi swap files during packaging. (do not merge)
Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]
Ignore hidden files and vi swap files during packaging. (do not merge)
BUG #
2233458
This is integrated from eclair.
Bjorn Bringert [Tue, 3 Nov 2009 15:37:36 +0000 (15:37 +0000)]
Fix type of _id col in SearchableDictionary
SDK SAMPLE CODE ONLY
Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.
Fixes http://b/issue?id=
2219970
Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
Eric Rowe [Wed, 4 Nov 2009 02:24:47 +0000 (18:24 -0800)]
Fix bug where monkey always tries to run multiple scripts.
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
Brett Chabot [Tue, 3 Nov 2009 20:29:42 +0000 (12:29 -0800)]
Fix ADT test data references.
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
Raphael [Tue, 3 Nov 2009 20:25:07 +0000 (12:25 -0800)]
am
03684b9d: am
4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '
03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-mr2
* commit '
03684b9d88cfa8f9775685d7a4efed2c96a57932':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Raphael [Tue, 3 Nov 2009 20:17:52 +0000 (12:17 -0800)]
am
4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '
4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair
* commit '
4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Android (Google) Code Review [Tue, 3 Nov 2009 19:45:53 +0000 (14:45 -0500)]
Merge change I01b36924 into eclair-mr2
* changes:
click OK to toggle between demos
Mike Reed [Tue, 3 Nov 2009 19:44:25 +0000 (11:44 -0800)]
click OK to toggle between demos
Xavier Ducrohet [Tue, 3 Nov 2009 19:34:02 +0000 (11:34 -0800)]
am
f9e0b264: Move check for hidden files in the proper method.
Merge commit '
f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-mr2
* commit '
f9e0b264422d086066a9d9deb2118617735e8d65':
Move check for hidden files in the proper method.
Xavier Ducrohet [Tue, 3 Nov 2009 18:52:54 +0000 (10:52 -0800)]
Move check for hidden files in the proper method.
Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148
Raphael [Tue, 3 Nov 2009 17:53:32 +0000 (09:53 -0800)]
am
8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '
8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-mr2
* commit '
8d700bdf67681ad405819c06906325768f8cf9ea':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Raphael [Tue, 3 Nov 2009 17:40:55 +0000 (09:40 -0800)]
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG
2233458
Xavier Ducrohet [Tue, 3 Nov 2009 07:16:41 +0000 (23:16 -0800)]
am
f31f6303: Merge change If0d0751e into eclair
Merge commit '
f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2
* commit '
f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.
Android (Google) Code Review [Tue, 3 Nov 2009 07:06:32 +0000 (02:06 -0500)]
Merge change If0d0751e into eclair
* changes:
Ignore hidden files and vi swap files during packaging.
Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]
Ignore hidden files and vi swap files during packaging.
BUG #
2233458
Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
Brett Chabot [Tue, 3 Nov 2009 01:14:46 +0000 (17:14 -0800)]
am
a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit '
a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-mr2
* commit '
a9982898b33399ddeee1e97f5f0d18c77ec1d538':
Remove calendar provider suite from continuous. DO NOT MERGE
Android (Google) Code Review [Tue, 3 Nov 2009 01:08:06 +0000 (20:08 -0500)]
Merge change Ida443c07 into eclair
* changes:
Remove calendar provider suite from continuous. DO NOT MERGE
Raphael [Mon, 2 Nov 2009 22:54:29 +0000 (14:54 -0800)]
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
SDK BUG
2232091
Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5
Android (Google) Code Review [Mon, 2 Nov 2009 22:31:49 +0000 (17:31 -0500)]
Merge change I20a74d79 into eclair-mr2
* changes:
Create way to run monkey with multiple scripts.
Xavier Ducrohet [Mon, 2 Nov 2009 20:45:31 +0000 (12:45 -0800)]
am
208c7569: (-s ours) am
0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '
208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-mr2
* commit '
208c75697e483f63f6075f28c1fc4ff49382f884':
Only apply permission to files with +x (do not merge)
Xavier Ducrohet [Mon, 2 Nov 2009 20:34:39 +0000 (12:34 -0800)]
am
0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair
* commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92':
Only apply permission to files with +x (do not merge)
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x (do not merge)
integrated from eclair branch.
Xavier Ducrohet [Mon, 2 Nov 2009 19:48:45 +0000 (11:48 -0800)]
am
192d5db1: Merge change Ied3304a0 into eclair
Merge commit '
192d5db1fedef99404644256f80740bb3763b049' into eclair-mr2
* commit '
192d5db1fedef99404644256f80740bb3763b049':
Only apply permission to files with +x
Android (Google) Code Review [Mon, 2 Nov 2009 19:40:10 +0000 (14:40 -0500)]
Merge change Ied3304a0 into eclair
* changes:
Only apply permission to files with +x
Brett Chabot [Sat, 31 Oct 2009 00:20:49 +0000 (17:20 -0700)]
Remove calendar provider suite from continuous. DO NOT MERGE
Bug
2171501
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
Raphael [Fri, 30 Oct 2009 20:08:23 +0000 (13:08 -0700)]
am
8a370089: am
d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '
8a370089b824f5acd97b5986b9b1e5bff3aefca4' into eclair-mr2
* commit '
8a370089b824f5acd97b5986b9b1e5bff3aefca4':
SDK Manager: Display error when saving settings
Raphael [Fri, 30 Oct 2009 20:01:22 +0000 (13:01 -0700)]
am
d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair
* commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de':
SDK Manager: Display error when saving settings
Raphael [Fri, 30 Oct 2009 04:20:41 +0000 (21:20 -0700)]
SDK Manager: Display error when saving settings
SDK BUG
2226029
Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba