OSDN Git Service
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.
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.
Raphael [Sat, 7 Nov 2009 00:51:10 +0000 (16:51 -0800)]
am
a4ebc122: am
3de25903: am
8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '
a4ebc12213eafa5297343c6c3e73c7a5acda3fb6' into eclair-mr2-plus-aosp
* commit '
a4ebc12213eafa5297343c6c3e73c7a5acda3fb6':
SDK Manager: refresh sources when HTTP/S pref is changed.
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:29:58 +0000 (14:29 -0800)]
am
86df89cf: am
2d2d3408: am
bf9a70fb: am
ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '
86df89cf62b4f4f274858b840fa97a50c1a9d50c'
* commit '
86df89cf62b4f4f274858b840fa97a50c1a9d50c':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Raphael [Fri, 6 Nov 2009 22:18:37 +0000 (14:18 -0800)]
am
2d2d3408: am
bf9a70fb: am
ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '
2d2d34086516a36e8d26f927c75b9944fd07b69f' into eclair-mr2-plus-aosp
* commit '
2d2d34086516a36e8d26f927c75b9944fd07b69f':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
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.
Dan Morrill [Fri, 6 Nov 2009 22:04:16 +0000 (14:04 -0800)]
Work-in-progress snapshot of the source.android.com (formerly PDK) site
refresh.
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:34:55 +0000 (11:34 -0800)]
am
01262b3a: am
f0f501ec: am
396a10e4: Merge change I793a35a9 into eclair
Merge commit '
01262b3ae709cbe1f141ab8976e4926510fd429d'
* commit '
01262b3ae709cbe1f141ab8976e4926510fd429d':
ADT now launches app as if launched from launcher.
Xavier Ducrohet [Fri, 6 Nov 2009 19:24:31 +0000 (11:24 -0800)]
am
f0f501ec: am
396a10e4: Merge change I793a35a9 into eclair
Merge commit '
f0f501ec27a4b37bf06288de808bc083d251921a' into eclair-mr2-plus-aosp
* commit '
f0f501ec27a4b37bf06288de808bc083d251921a':
ADT now launches app as if launched from launcher.
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:46:46 +0000 (10:46 -0800)]
am
886119f5: am
e9373a42: am
7853d243: Merge change I1fa1ae88 into eclair
Merge commit '
886119f56de90a5569915be9782de4b69460930a'
* commit '
886119f56de90a5569915be9782de4b69460930a':
Move Tools to rev 5, and ADT to 0.9.5
Xavier Ducrohet [Fri, 6 Nov 2009 18:36:18 +0000 (10:36 -0800)]
am
e9373a42: am
7853d243: Merge change I1fa1ae88 into eclair
Merge commit '
e9373a42114a9ed37dbdc68991250bd40f54552f' into eclair-mr2-plus-aosp
* commit '
e9373a42114a9ed37dbdc68991250bd40f54552f':
Move Tools to rev 5, and ADT to 0.9.5
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 22:11:53 +0000 (14:11 -0800)]
am
ae8ea92c: am
a04b9614: am
b5723869: Merge change I85aa2b1d into eclair
Merge commit '
ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214'
* commit '
ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214':
create a test app that allows direct control of a sync adapter for testing purposes
mike ritter [Thu, 5 Nov 2009 22:11:46 +0000 (14:11 -0800)]
am
3fb2d576: am
c0446aa9: Merge change I4d2a57bc into eclair-mr2
Merge commit '
3fb2d576e9f386ecaa6a2637131c8fac89d05276'
* commit '
3fb2d576e9f386ecaa6a2637131c8fac89d05276':
Moved values into attributes of xml elements where they belong
Fred Quintana [Thu, 5 Nov 2009 21:58:54 +0000 (13:58 -0800)]
am
a04b9614: am
b5723869: Merge change I85aa2b1d into eclair
Merge commit '
a04b9614ce35fe22e99c0bb765084a0d8e3af3f1' into eclair-mr2-plus-aosp
* commit '
a04b9614ce35fe22e99c0bb765084a0d8e3af3f1':
create a test app that allows direct control of a sync adapter for testing purposes
mike ritter [Thu, 5 Nov 2009 21:58:42 +0000 (13:58 -0800)]
am
c0446aa9: Merge change I4d2a57bc into eclair-mr2
Merge commit '
c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp
* commit '
c0446aa9d2b6610dd3d92611c0c0867e960198d9':
Moved values into attributes of xml elements where they belong
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:35:49 +0000 (15:35 -0800)]
am
019eca1a: (-s ours) am
4e97e5da: am
421e8d33: (-s ours) am
7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '
019eca1a7920da9cf5dc7efebb7d24b86561a989'
* commit '
019eca1a7920da9cf5dc7efebb7d24b86561a989':
Ignore hidden files and vi swap files during packaging. (do not merge)
Xavier Ducrohet [Wed, 4 Nov 2009 23:25:12 +0000 (15:25 -0800)]
am
4e97e5da: am
421e8d33: (-s ours) am
7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '
4e97e5da372f1be39e9eeccc9cad7a551c164828' into eclair-mr2-plus-aosp
* commit '
4e97e5da372f1be39e9eeccc9cad7a551c164828':
Ignore hidden files and vi swap files during packaging. (do not merge)
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:53:03 +0000 (18:53 -0800)]
am
a6d49e3a: am
80de9538: Fix bug where monkey always tries to run multiple scripts.
Merge commit '
a6d49e3a2ea9b6b4f4cb01c32fc910ea070db45e'
* commit '
a6d49e3a2ea9b6b4f4cb01c32fc910ea070db45e':
Fix bug where monkey always tries to run multiple scripts.
Eric Rowe [Wed, 4 Nov 2009 02:42:55 +0000 (18:42 -0800)]
am
80de9538: Fix bug where monkey always tries to run multiple scripts.
Merge commit '
80de953874fd16dae6c89a2949e2fd5a14c1303f' into eclair-mr2-plus-aosp
* commit '
80de953874fd16dae6c89a2949e2fd5a14c1303f':
Fix bug where monkey always tries to run multiple scripts.
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.
Raphael [Tue, 3 Nov 2009 20:46:16 +0000 (12:46 -0800)]
am
3d18353b: am
0136501f: am
03684b9d: am
4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '
3d18353bacbce63c87905a6d6e35806d70ecb556'
* commit '
3d18353bacbce63c87905a6d6e35806d70ecb556':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Raphael [Tue, 3 Nov 2009 20:35:39 +0000 (12:35 -0800)]
am
0136501f: am
03684b9d: am
4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '
0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp
* commit '
0136501f88c2e5181d9bf60c5d71fdc4696361c0':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux 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
Mike Reed [Tue, 3 Nov 2009 20:04:43 +0000 (12:04 -0800)]
am
9aa2afdf: am
093d9020: Merge change I01b36924 into eclair-mr2
Merge commit '
9aa2afdf71702cef8080f862361af4b3fce92137'
* commit '
9aa2afdf71702cef8080f862361af4b3fce92137':
click OK to toggle between demos
Mike Reed [Tue, 3 Nov 2009 19:54:45 +0000 (11:54 -0800)]
am
093d9020: Merge change I01b36924 into eclair-mr2
Merge commit '
093d9020e4569c499d6e0094183fc3a90542404d' into eclair-mr2-plus-aosp
* commit '
093d9020e4569c499d6e0094183fc3a90542404d':
click OK to toggle between demos
Xavier Ducrohet [Tue, 3 Nov 2009 19:54:27 +0000 (11:54 -0800)]
am
3a8967f6: am
78c9bb59: am
f9e0b264: Move check for hidden files in the proper method.
Merge commit '
3a8967f62c3d4a0ebeb7a9eeae5d9f273af29448'
* commit '
3a8967f62c3d4a0ebeb7a9eeae5d9f273af29448':
Move check for hidden files in the proper method.
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
Xavier Ducrohet [Tue, 3 Nov 2009 19:44:40 +0000 (11:44 -0800)]
am
78c9bb59: am
f9e0b264: Move check for hidden files in the proper method.
Merge commit '
78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b' into eclair-mr2-plus-aosp
* commit '
78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b':
Move check for hidden files in the proper method.
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 18:15:19 +0000 (10:15 -0800)]
am
f2bf99c3: am
a3dce5a0: am
8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '
f2bf99c3874db32474f688051e65def896a809da'
* commit '
f2bf99c3874db32474f688051e65def896a809da':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Raphael [Tue, 3 Nov 2009 18:02:24 +0000 (10:02 -0800)]
am
a3dce5a0: am
8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '
a3dce5a089e64ac0e52405ae34560392d360e964' into eclair-mr2-plus-aosp
* commit '
a3dce5a089e64ac0e52405ae34560392d360e964':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
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:36:45 +0000 (23:36 -0800)]
am
7f98994a: am
35d140af: am
f31f6303: Merge change If0d0751e into eclair
Merge commit '
7f98994af21d911a2e80e82539524987594c408f'
* commit '
7f98994af21d911a2e80e82539524987594c408f':
Ignore hidden files and vi swap files during packaging.
Xavier Ducrohet [Tue, 3 Nov 2009 07:26:46 +0000 (23:26 -0800)]
am
35d140af: am
f31f6303: Merge change If0d0751e into eclair
Merge commit '
35d140afb413e52f0ed43e30d41050348688f2e2' into eclair-mr2-plus-aosp
* commit '
35d140afb413e52f0ed43e30d41050348688f2e2':
Ignore hidden files and vi swap files during packaging.
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:46:28 +0000 (17:46 -0800)]
am
78ba4a54: (-s ours) am
56af356a: am
a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit '
78ba4a54448b9f68c2a9d810e21d6af8b2c014e0'
* commit '
78ba4a54448b9f68c2a9d810e21d6af8b2c014e0':
Remove calendar provider suite from continuous. DO NOT MERGE
Brett Chabot [Tue, 3 Nov 2009 01:25:16 +0000 (17:25 -0800)]
am
56af356a: am
a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit '
56af356a420bb6329cf309d7ad972f8441fd911c' into eclair-mr2-plus-aosp
* commit '
56af356a420bb6329cf309d7ad972f8441fd911c':
Remove calendar provider suite from continuous. DO NOT MERGE
OSDN Git Service
