OSDN Git Service
Brett Chabot [Thu, 22 Oct 2009 18:09:03 +0000 (11:09 -0700)]
am
470b7360: am
b083cef9: am
3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '
470b736082651fff15fc7be2057cb8c0f7722643'
* commit '
470b736082651fff15fc7be2057cb8c0f7722643':
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Thu, 22 Oct 2009 18:08:59 +0000 (11:08 -0700)]
am
d46629fd: am
1dcfd370: am
9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit '
d46629fd94271a59419263372ee53d2a46a4507c'
* commit '
d46629fd94271a59419263372ee53d2a46a4507c':
Add OpenGL 2.0 headers and libraries to the NDK.
David 'Digit' Turner [Thu, 22 Oct 2009 18:08:54 +0000 (11:08 -0700)]
am
8c5b2b4b: am
cf89eb6c: am
975491c9: Add android-5 platform to the NDK.
Merge commit '
8c5b2b4b06c7d7130e0259feb93d8ae4b38480c7'
* commit '
8c5b2b4b06c7d7130e0259feb93d8ae4b38480c7':
Add android-5 platform to the NDK.
Brett Chabot [Thu, 22 Oct 2009 18:08:50 +0000 (11:08 -0700)]
am
4ec5a747: am
2ad4d5f3: am
4ee04869: Merge change I12f05ef0 into eclair
Merge commit '
4ec5a74731ce3b8cd0fa0073ef73009515df134d'
* commit '
4ec5a74731ce3b8cd0fa0073ef73009515df134d':
Add ability to retrieve instrumentations from android_manifest parser.
Raphael [Thu, 22 Oct 2009 18:08:45 +0000 (11:08 -0700)]
am
6dc8fc62: am
e9059bc8: am
f6f2d37d: Merge change I03351f1b into eclair
Merge commit '
6dc8fc626a6f93ea8a7445dbf89630405b4dd8db'
* commit '
6dc8fc626a6f93ea8a7445dbf89630405b4dd8db':
SDK Updater: switch UdpateChooserDialog to jface.
David 'Digit' Turner [Thu, 22 Oct 2009 18:08:41 +0000 (11:08 -0700)]
am
0fd84116: am
476ba944: am
b48ab640: Allow applications to target future API levels
Merge commit '
0fd84116ea99e9a6bd9579fd33d8a150cd2b0794'
* commit '
0fd84116ea99e9a6bd9579fd33d8a150cd2b0794':
Allow applications to target future API levels
android-build SharedAccount [Thu, 22 Oct 2009 17:59:33 +0000 (10:59 -0700)]
am
1d9db5a4: am
a8bd6dac: Previously merged by hand, now empty merge commit \'
ec59a8834bbca256495045a6687a672f66b52df0\' into eclair-mr2
Merge commit '
1d9db5a454395ed08f8f2b8c6ae9aa6dd7adcb73'
* commit '
1d9db5a454395ed08f8f2b8c6ae9aa6dd7adcb73':
Remove build/platforms/android-*/common directories.
android-build SharedAccount [Thu, 22 Oct 2009 17:59:28 +0000 (10:59 -0700)]
android-build SharedAccount [Thu, 22 Oct 2009 17:59:21 +0000 (10:59 -0700)]
Brett Chabot [Thu, 22 Oct 2009 17:58:05 +0000 (10:58 -0700)]
am
b083cef9: am
3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '
b083cef9fb75f6dfa6c041d275f78bcdfbe44207' into eclair-mr2-plus-aosp
* commit '
b083cef9fb75f6dfa6c041d275f78bcdfbe44207':
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Thu, 22 Oct 2009 17:58:01 +0000 (10:58 -0700)]
am
1dcfd370: am
9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit '
1dcfd370d6a48e04a9ea302d289a409893096954' into eclair-mr2-plus-aosp
* commit '
1dcfd370d6a48e04a9ea302d289a409893096954':
Add OpenGL 2.0 headers and libraries to the NDK.
David 'Digit' Turner [Thu, 22 Oct 2009 17:57:56 +0000 (10:57 -0700)]
am
cf89eb6c: am
975491c9: Add android-5 platform to the NDK.
Merge commit '
cf89eb6c2d1844c0701b0ba707a3e4fb9544af44' into eclair-mr2-plus-aosp
* commit '
cf89eb6c2d1844c0701b0ba707a3e4fb9544af44':
Add android-5 platform to the NDK.
Brett Chabot [Thu, 22 Oct 2009 17:57:52 +0000 (10:57 -0700)]
am
2ad4d5f3: am
4ee04869: Merge change I12f05ef0 into eclair
Merge commit '
2ad4d5f31be2acdfb487f5e8ccea60d707aab91c' into eclair-mr2-plus-aosp
* commit '
2ad4d5f31be2acdfb487f5e8ccea60d707aab91c':
Add ability to retrieve instrumentations from android_manifest parser.
Raphael [Thu, 22 Oct 2009 17:57:48 +0000 (10:57 -0700)]
am
e9059bc8: am
f6f2d37d: Merge change I03351f1b into eclair
Merge commit '
e9059bc82263ae8f359100ab90e46ca8d36ffad3' into eclair-mr2-plus-aosp
* commit '
e9059bc82263ae8f359100ab90e46ca8d36ffad3':
SDK Updater: switch UdpateChooserDialog to jface.
David 'Digit' Turner [Thu, 22 Oct 2009 17:57:44 +0000 (10:57 -0700)]
am
476ba944: am
b48ab640: Allow applications to target future API levels
Merge commit '
476ba9449a3eeb997312ec35ab02a08cd5f7bf47' into eclair-mr2-plus-aosp
* commit '
476ba9449a3eeb997312ec35ab02a08cd5f7bf47':
Allow applications to target future API levels
android-build SharedAccount [Thu, 22 Oct 2009 17:48:21 +0000 (10:48 -0700)]
am
a8bd6dac: Previously merged by hand, now empty merge commit \'
ec59a8834bbca256495045a6687a672f66b52df0\' into eclair-mr2
Merge commit '
a8bd6dacdc308cdecb6864a08ba28beed3eef86c' into eclair-mr2-plus-aosp
* commit '
a8bd6dacdc308cdecb6864a08ba28beed3eef86c':
Remove build/platforms/android-*/common directories.
android-build SharedAccount [Thu, 22 Oct 2009 17:48:17 +0000 (10:48 -0700)]
android-build SharedAccount [Thu, 22 Oct 2009 17:48:11 +0000 (10:48 -0700)]
Brett Chabot [Thu, 22 Oct 2009 17:47:38 +0000 (10:47 -0700)]
am
3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '
3447c407dc70a365d6d7faade0f3725315d05e54' into eclair-mr2
* commit '
3447c407dc70a365d6d7faade0f3725315d05e54':
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Thu, 22 Oct 2009 17:47:08 +0000 (10:47 -0700)]
am
9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit '
9eff6cbfaa210af0f5500f75576b457565cfafae' into eclair-mr2
* commit '
9eff6cbfaa210af0f5500f75576b457565cfafae':
Add OpenGL 2.0 headers and libraries to the NDK.
David 'Digit' Turner [Thu, 22 Oct 2009 17:46:26 +0000 (10:46 -0700)]
am
975491c9: Add android-5 platform to the NDK.
Merge commit '
975491c9ebb8ec659d96318df5f37f92c903f09f' into eclair-mr2
* commit '
975491c9ebb8ec659d96318df5f37f92c903f09f':
Add android-5 platform to the NDK.
Brett Chabot [Thu, 22 Oct 2009 17:46:22 +0000 (10:46 -0700)]
am
4ee04869: Merge change I12f05ef0 into eclair
Merge commit '
4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-mr2
* commit '
4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
Add ability to retrieve instrumentations from android_manifest parser.
Raphael [Thu, 22 Oct 2009 17:46:07 +0000 (10:46 -0700)]
am
f6f2d37d: Merge change I03351f1b into eclair
Merge commit '
f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-mr2
* commit '
f6f2d37d9365ad1bfd53da2134eeed8604c36954':
SDK Updater: switch UdpateChooserDialog to jface.
David 'Digit' Turner [Thu, 22 Oct 2009 17:45:58 +0000 (10:45 -0700)]
am
b48ab640: Allow applications to target future API levels
Merge commit '
b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-mr2
* commit '
b48ab6402801d82ac205b34ffa1bc6787a0042b6':
Allow applications to target future API levels
android-build SharedAccount [Thu, 22 Oct 2009 17:37:19 +0000 (10:37 -0700)]
Previously merged by hand, now empty merge commit '
ec59a8834bbca256495045a6687a672f66b52df0' into eclair-mr2
android-build SharedAccount [Thu, 22 Oct 2009 17:36:13 +0000 (10:36 -0700)]
Part 2 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
android-build SharedAccount [Thu, 22 Oct 2009 17:32:15 +0000 (10:32 -0700)]
Part 1 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
David 'Digit' Turner [Thu, 22 Oct 2009 14:00:33 +0000 (07:00 -0700)]
am
888c76db: am
6e8cfcec: am
6f605c32: Merge change If7aa22af into eclair
Merge commit '
888c76db93c2d38fb3ac56f1be77d46af1dfef19'
* commit '
888c76db93c2d38fb3ac56f1be77d46af1dfef19':
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Thu, 22 Oct 2009 14:00:29 +0000 (07:00 -0700)]
am
e5309ad8: am
1c962f87: am
fb766f44: Merge change I898b43fe into eclair
Merge commit '
e5309ad8509f928ede3087d3afb176c099bc1dac'
* commit '
e5309ad8509f928ede3087d3afb176c099bc1dac':
Refresh NDK C library headers for all platforms
Raphael [Thu, 22 Oct 2009 14:00:25 +0000 (07:00 -0700)]
Raphael [Thu, 22 Oct 2009 14:00:21 +0000 (07:00 -0700)]
am
377912f3: am
71ae9b3e: am
d75c03e4: am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
377912f3f6c765e981222c808c0d6240c20db502'
* commit '
377912f3f6c765e981222c808c0d6240c20db502':
AVD Manager: Properly disable AVD > Start > ? under Windows
David 'Digit' Turner [Thu, 22 Oct 2009 13:51:50 +0000 (06:51 -0700)]
am
6e8cfcec: am
6f605c32: Merge change If7aa22af into eclair
Merge commit '
6e8cfcece99260eb2ce539797551153d72b6ca29' into eclair-mr2-plus-aosp
* commit '
6e8cfcece99260eb2ce539797551153d72b6ca29':
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Thu, 22 Oct 2009 13:51:46 +0000 (06:51 -0700)]
am
1c962f87: am
fb766f44: Merge change I898b43fe into eclair
Merge commit '
1c962f8758bb7e80639da221788f571dddcc8b02' into eclair-mr2-plus-aosp
* commit '
1c962f8758bb7e80639da221788f571dddcc8b02':
Refresh NDK C library headers for all platforms
Raphael [Thu, 22 Oct 2009 13:51:42 +0000 (06:51 -0700)]
am
66d13f19: am
e97d99d0: am
d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '
66d13f192b50aef39272da5330d4484de7d68ca4' into eclair-mr2-plus-aosp
* commit '
66d13f192b50aef39272da5330d4484de7d68ca4':
SDK Updater: UI polish
Raphael [Thu, 22 Oct 2009 13:51:38 +0000 (06:51 -0700)]
am
71ae9b3e: am
d75c03e4: am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
71ae9b3e2f79a7fbfaf9283f75252988e1df5414' into eclair-mr2-plus-aosp
* commit '
71ae9b3e2f79a7fbfaf9283f75252988e1df5414':
AVD Manager: Properly disable AVD > Start > ? under Windows
David 'Digit' Turner [Thu, 22 Oct 2009 13:38:55 +0000 (06:38 -0700)]
am
6f605c32: Merge change If7aa22af into eclair
Merge commit '
6f605c32adfe3ac23bb91f857fa89b9cb037237a' into eclair-mr2
* commit '
6f605c32adfe3ac23bb91f857fa89b9cb037237a':
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Thu, 22 Oct 2009 13:38:38 +0000 (06:38 -0700)]
am
fb766f44: Merge change I898b43fe into eclair
Merge commit '
fb766f44a71f7b97610065fd1628652026f69880' into eclair-mr2
* commit '
fb766f44a71f7b97610065fd1628652026f69880':
Refresh NDK C library headers for all platforms
Raphael [Thu, 22 Oct 2009 13:38:12 +0000 (06:38 -0700)]
am
e97d99d0: am
d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '
e97d99d02c655d3fa2801bb81787a1aff2d36d99' into eclair-mr2
* commit '
e97d99d02c655d3fa2801bb81787a1aff2d36d99':
SDK Updater: UI polish
Raphael [Thu, 22 Oct 2009 13:38:07 +0000 (06:38 -0700)]
am
d75c03e4: am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
d75c03e4f18b11ba6f13112be3232db6795ed0fe' into eclair-mr2
* commit '
d75c03e4f18b11ba6f13112be3232db6795ed0fe':
AVD Manager: Properly disable AVD > Start > ? under Windows
Raphael [Thu, 22 Oct 2009 05:44:28 +0000 (22:44 -0700)]
am
b62c4208: am
d9d3891b: am
90b60a39: am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
b62c420829f1bc23bf700b7036cc8361e3c61e9f'
* commit '
b62c420829f1bc23bf700b7036cc8361e3c61e9f':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Thu, 22 Oct 2009 05:44:24 +0000 (22:44 -0700)]
am
736393ef: am
17180783: am
bf2cc38e: am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
736393ef2c62612dd2c86eb9c5e9dd33f09d9a69'
* commit '
736393ef2c62612dd2c86eb9c5e9dd33f09d9a69':
Android.bat: remove /O in xcopy.
Raphael [Thu, 22 Oct 2009 05:31:00 +0000 (22:31 -0700)]
am
d9d3891b: am
90b60a39: am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
d9d3891bf5f4922520783f2fbb1ff4ec61403ba0' into eclair-mr2-plus-aosp
* commit '
d9d3891bf5f4922520783f2fbb1ff4ec61403ba0':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Thu, 22 Oct 2009 05:30:55 +0000 (22:30 -0700)]
am
17180783: am
bf2cc38e: am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
17180783e53f84d244e7c61d890039d9fa783443' into eclair-mr2-plus-aosp
* commit '
17180783e53f84d244e7c61d890039d9fa783443':
Android.bat: remove /O in xcopy.
Raphael [Thu, 22 Oct 2009 05:22:16 +0000 (22:22 -0700)]
am
90b60a39: am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
90b60a3985d07f6113d91737fcd37da2d282ce8f' into eclair-mr2
* commit '
90b60a3985d07f6113d91737fcd37da2d282ce8f':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Thu, 22 Oct 2009 05:22:11 +0000 (22:22 -0700)]
am
bf2cc38e: am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
bf2cc38e5b2a30f2f0906f3f37ed767af092956d' into eclair-mr2
* commit '
bf2cc38e5b2a30f2f0906f3f37ed767af092956d':
Android.bat: remove /O in xcopy.
Android (Google) Code Review [Wed, 21 Oct 2009 22:53:58 +0000 (18:53 -0400)]
Merge change I8f6ac3c9 into eclair
* changes:
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Wed, 21 Oct 2009 21:43:09 +0000 (14:43 -0700)]
Add OpenGL 2.0 headers and libraries to the NDK.
This is only available for platform android-5. A sample
application will be available in a next patch.
Brett Chabot [Wed, 21 Oct 2009 21:23:54 +0000 (14:23 -0700)]
Refactor runtest test_defs to allow programmatic creation.
Previously a test definition could only be created via xml.
Also fix some minor lint warnings.
David 'Digit' Turner [Wed, 21 Oct 2009 17:26:03 +0000 (10:26 -0700)]
Add android-5 platform to the NDK.
For now, this is an exact copy of android-4. Another patch will
provide additionnal headers and libraries for OpenGL 2.0 plus
the relevant documentation bits and a sample app.
Android (Google) Code Review [Wed, 21 Oct 2009 21:26:32 +0000 (17:26 -0400)]
Merge change I12f05ef0 into eclair
* changes:
Add ability to retrieve instrumentations from android_manifest parser.
Android (Google) Code Review [Wed, 21 Oct 2009 21:19:40 +0000 (17:19 -0400)]
Merge change I03351f1b into eclair
* changes:
SDK Updater: switch UdpateChooserDialog to jface.
Raphael [Wed, 21 Oct 2009 05:14:03 +0000 (22:14 -0700)]
SDK Updater: switch UdpateChooserDialog to jface.
Change-Id: I03351f1b21b81d1654ce4ecb1c8ca5846f1fb7c4
Brett Chabot [Wed, 21 Oct 2009 18:16:42 +0000 (11:16 -0700)]
Add ability to retrieve instrumentations from android_manifest parser.
Also add a simple unit test for the parser.
David 'Digit' Turner [Wed, 21 Oct 2009 00:51:19 +0000 (17:51 -0700)]
Allow applications to target future API levels
E.g. if an application's default.properties targets android-10
then the build system will default it to the highest supported
API level found in build/platforms (e.g. android-4 currently).
Android (Google) Code Review [Tue, 20 Oct 2009 23:23:59 +0000 (19:23 -0400)]
Merge change I31f23a0b into eclair
* changes:
Remove build/platforms/android-*/common directories.
Android (Google) Code Review [Tue, 20 Oct 2009 23:18:07 +0000 (19:18 -0400)]
Merge change If7aa22af into eclair
* changes:
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Tue, 20 Oct 2009 22:53:42 +0000 (15:53 -0700)]
Remove build/platforms/android-*/common directories.
There is little point to use symlinks to point to them from
android-*/arch-arm/usr/include. Besides, the zip file format doesn't
support symlinks which meant that each file was essentially
duplicated in the final release package.
Android (Google) Code Review [Tue, 20 Oct 2009 22:53:24 +0000 (18:53 -0400)]
Merge change I898b43fe into eclair
* changes:
Refresh NDK C library headers for all platforms
Android (Google) Code Review [Tue, 20 Oct 2009 22:51:07 +0000 (18:51 -0400)]
Merge change Ife1f456a
* changes:
Added Release Checklist to PDK. Original content written by Dianne.
David 'Digit' Turner [Tue, 20 Oct 2009 22:33:40 +0000 (15:33 -0700)]
Remove bash-ism from build-ndk-sysroot.sh
Raphael [Tue, 20 Oct 2009 22:32:13 +0000 (15:32 -0700)]
am
d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '
d58cd1b5d3bfc2433201fbe22621f4924a89c04d' into eclair
* commit '
d58cd1b5d3bfc2433201fbe22621f4924a89c04d':
SDK Updater: UI polish
Raphael [Tue, 20 Oct 2009 22:32:09 +0000 (15:32 -0700)]
am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
7c1adfe76fbf89cc76ff51bf0d228c13213fe563' into eclair
* commit '
7c1adfe76fbf89cc76ff51bf0d228c13213fe563':
AVD Manager: Properly disable AVD > Start > ? under Windows
David 'Digit' Turner [Tue, 20 Oct 2009 22:25:40 +0000 (15:25 -0700)]
Refresh NDK C library headers for all platforms
Android (Google) Code Review [Tue, 20 Oct 2009 22:18:18 +0000 (18:18 -0400)]
Merge change I075d2eae into eclair-sdk
* changes:
SDK Updater: UI polish
Android (Google) Code Review [Tue, 20 Oct 2009 22:16:59 +0000 (18:16 -0400)]
Merge change I5b1f8bca into eclair-sdk
* changes:
AVD Manager: Properly disable AVD > Start > ? under Windows
Raphael [Tue, 20 Oct 2009 22:09:56 +0000 (15:09 -0700)]
AVD Manager: Properly disable AVD > Start > ? under Windows
SDK BUG
2201546
Change-Id: I5b1f8bcaf57f2e7f94b4109cb62a3a5eadcd24a9
Raphael [Tue, 20 Oct 2009 21:54:30 +0000 (14:54 -0700)]
SDK Updater: UI polish
Fixes the following issues:
- Updater says it didnd't install addon and then install it
(cause: UpdaterData was looking for an ArchiveInfo in a map of Archive)
- Added a label explaining the [*] in the dependency list.
- Added the originating site to the long description in the package chooser.
- Display downloading/installing comments in the result window.
- Fixed app name in dialog when tools are updated.
Change-Id: I075d2eaeb357f33671f7e9e70a906ca48000908d
David Warren [Tue, 20 Oct 2009 20:39:56 +0000 (13:39 -0700)]
Added Release Checklist to PDK. Original content written by Dianne.
Raphael [Tue, 20 Oct 2009 20:19:58 +0000 (13:19 -0700)]
am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
c9b04450ef204e03de3f3da886cd45808550dfbc' into eclair
* commit '
c9b04450ef204e03de3f3da886cd45808550dfbc':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Tue, 20 Oct 2009 20:19:54 +0000 (13:19 -0700)]
am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
5708d1576b3e19601804ea7dfffdee3da6c0c00d' into eclair
* commit '
5708d1576b3e19601804ea7dfffdee3da6c0c00d':
Android.bat: remove /O in xcopy.
Android (Google) Code Review [Tue, 20 Oct 2009 20:13:50 +0000 (16:13 -0400)]
Merge change I4151529e into eclair-sdk
* changes:
Fix potential NPE in manifest editor when switching SDKs
Raphael [Tue, 20 Oct 2009 19:44:18 +0000 (12:44 -0700)]
Fix potential NPE in manifest editor when switching SDKs
The UiElementNode depends on the target to compute the
description and it's entirely possible for the target to
be null while the SDK is being unloaded/reloaded.
SDK BUG
2196260
Change-Id: I4151529ea3b6a65eade47d03e55fc93cad8596d9
Raphael [Tue, 20 Oct 2009 19:16:51 +0000 (12:16 -0700)]
Android.bat: remove /O in xcopy.
It means "copy ownership". But on the Vista 64 box in the lab,
it make the xcopy of lib/x86/swt.jar fail the next time when it
was already present.
SDK BUG
2198636
Eric Rowe [Tue, 20 Oct 2009 19:02:21 +0000 (12:02 -0700)]
am
7125a083: am
20e7a15b: Modify Monkey so that scripts can use raw and user events.
Merge commit '
7125a083185474476b35eb3036ef0f1b96460c85'
* commit '
7125a083185474476b35eb3036ef0f1b96460c85':
Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Tue, 20 Oct 2009 18:50:50 +0000 (11:50 -0700)]
am
20e7a15b: Modify Monkey so that scripts can use raw and user events.
Merge commit '
20e7a15bb74d7349ee879bb311a0607325f49aaf' into eclair-mr2-plus-aosp
* commit '
20e7a15bb74d7349ee879bb311a0607325f49aaf':
Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Tue, 20 Oct 2009 01:06:38 +0000 (18:06 -0700)]
Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java. Also, fix bug where too few arguments in
the script causes a RuntimeException.
Xavier Ducrohet [Mon, 19 Oct 2009 22:09:56 +0000 (15:09 -0700)]
am
8a87b652: am
0d439910: am
302e013b: am
fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '
8a87b652e6d43ee67a2ed8fae2679fb4b41e21a3'
* commit '
8a87b652e6d43ee67a2ed8fae2679fb4b41e21a3':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Xavier Ducrohet [Mon, 19 Oct 2009 21:58:36 +0000 (14:58 -0700)]
am
0d439910: am
302e013b: am
fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '
0d43991074e178c388b06b2f8984967c140451b9' into eclair-mr2-plus-aosp
* commit '
0d43991074e178c388b06b2f8984967c140451b9':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Xavier Ducrohet [Mon, 19 Oct 2009 21:46:00 +0000 (14:46 -0700)]
am
302e013b: am
fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '
302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b' into eclair-mr2
* commit '
302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Xavier Ducrohet [Mon, 19 Oct 2009 21:37:11 +0000 (14:37 -0700)]
am
fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '
fc5b5aecdeca8bb32eba9d38961b6649395f8913' into eclair
* commit '
fc5b5aecdeca8bb32eba9d38961b6649395f8913':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Android (Google) Code Review [Mon, 19 Oct 2009 21:24:34 +0000 (17:24 -0400)]
Merge change I1a00abb0 into eclair-sdk
* changes:
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Xavier Ducrohet [Mon, 19 Oct 2009 19:56:57 +0000 (12:56 -0700)]
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Raphael [Sat, 17 Oct 2009 01:29:30 +0000 (18:29 -0700)]
am
17c0f72c: (-s ours) am
501d2ae5: am
ea82bcc2: (-s ours) am
5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '
17c0f72c8378956533a89624c715786be1e3ad52'
* commit '
17c0f72c8378956533a89624c715786be1e3ad52':
SDK Updater: properly update/install doc. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:29:26 +0000 (18:29 -0700)]
am
e0b0c2cc: (-s ours) am
1a63ee0b: am
15549af0: (-s ours) am
af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '
e0b0c2ccf1e267f843e9890b87d6649b8dc6059c'
* commit '
e0b0c2ccf1e267f843e9890b87d6649b8dc6059c':
Add save/load for the user-made Layout Devices. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:29:22 +0000 (18:29 -0700)]
am
ef04e43f: (-s ours) am
cad5cf2e: am
81747d72: (-s ours) am
5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '
ef04e43fb58cec4a9f2237379451a7fa0e9d1fe6'
* commit '
ef04e43fb58cec4a9f2237379451a7fa0e9d1fe6':
WQVGA skin (240x400) (do not merge)
Raphael [Sat, 17 Oct 2009 01:29:17 +0000 (18:29 -0700)]
am
f7b5b952: am
b1192a67: am
2a13cc20: SDK Updater: properly update/install doc.
Merge commit '
f7b5b952173539dd659082d036efe1617963c4a1'
* commit '
f7b5b952173539dd659082d036efe1617963c4a1':
SDK Updater: properly update/install doc.
Raphael [Sat, 17 Oct 2009 01:19:03 +0000 (18:19 -0700)]
am
501d2ae5: am
ea82bcc2: (-s ours) am
5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '
501d2ae52d02db9676ab2fbc5452c38289ebd84c' into eclair-mr2-plus-aosp
* commit '
501d2ae52d02db9676ab2fbc5452c38289ebd84c':
SDK Updater: properly update/install doc. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:19:00 +0000 (18:19 -0700)]
am
1a63ee0b: am
15549af0: (-s ours) am
af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '
1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad' into eclair-mr2-plus-aosp
* commit '
1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad':
Add save/load for the user-made Layout Devices. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:18:56 +0000 (18:18 -0700)]
am
cad5cf2e: am
81747d72: (-s ours) am
5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '
cad5cf2e9dffa8735435c3a046438028f1a1832a' into eclair-mr2-plus-aosp
* commit '
cad5cf2e9dffa8735435c3a046438028f1a1832a':
WQVGA skin (240x400) (do not merge)
Raphael [Sat, 17 Oct 2009 01:18:52 +0000 (18:18 -0700)]
am
b1192a67: am
2a13cc20: SDK Updater: properly update/install doc.
Merge commit '
b1192a677c3b17dc51c0bfde07f8d7586bf8f4b6' into eclair-mr2-plus-aosp
* commit '
b1192a677c3b17dc51c0bfde07f8d7586bf8f4b6':
SDK Updater: properly update/install doc.
Raphael [Sat, 17 Oct 2009 01:08:23 +0000 (18:08 -0700)]
am
ea82bcc2: (-s ours) am
5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '
ea82bcc20b12af0ba72a12d7e178be413b806bfb' into eclair-mr2
* commit '
ea82bcc20b12af0ba72a12d7e178be413b806bfb':
SDK Updater: properly update/install doc. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:08:18 +0000 (18:08 -0700)]
am
15549af0: (-s ours) am
af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '
15549af01e6d1d62b56e825800191d223c4f29a2' into eclair-mr2
* commit '
15549af01e6d1d62b56e825800191d223c4f29a2':
Add save/load for the user-made Layout Devices. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 01:08:14 +0000 (18:08 -0700)]
am
81747d72: (-s ours) am
5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '
81747d726994d027d64652a6f6ee59d76427df31' into eclair-mr2
* commit '
81747d726994d027d64652a6f6ee59d76427df31':
WQVGA skin (240x400) (do not merge)
Raphael [Sat, 17 Oct 2009 01:08:10 +0000 (18:08 -0700)]
am
2a13cc20: SDK Updater: properly update/install doc.
Merge commit '
2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60' into eclair-mr2
* commit '
2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60':
SDK Updater: properly update/install doc.
Raphael [Sat, 17 Oct 2009 00:57:18 +0000 (17:57 -0700)]
am
5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '
5cff81bb5878d00925cbab24822123f1feebbbb8' into eclair
* commit '
5cff81bb5878d00925cbab24822123f1feebbbb8':
SDK Updater: properly update/install doc. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 00:57:15 +0000 (17:57 -0700)]
am
af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '
af496633406c19192db960d822b51fa1f574fbf2' into eclair
* commit '
af496633406c19192db960d822b51fa1f574fbf2':
Add save/load for the user-made Layout Devices. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 00:57:10 +0000 (17:57 -0700)]
am
5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
Merge commit '
5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf' into eclair
* commit '
5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf':
WQVGA skin (240x400) (do not merge)
Raphael [Thu, 15 Oct 2009 23:44:18 +0000 (16:44 -0700)]
SDK Updater: properly update/install doc. (do not merge)
This contains the following changes:
- a new interface IPackageVersion for all Package classes that can
provide an AndroidVersion getVersion().
- fixes the "update sdk" where the local repo has no doc by suggesting
to install the most up-to-date doc.
- fixes a bad cast in the UpdaterLogic.
- normalizes the long descriptions but adding the revision if not
present.
- fixes an edge case when displaying the very long description of the
docs package, i.e. need to indicate it is upgraded due to a version
change.
SDK BUG
2192352
Xavier Ducrohet [Thu, 15 Oct 2009 00:57:30 +0000 (17:57 -0700)]
Add save/load for the user-made Layout Devices. (do not merge)
Also added support for mcc/mnc in the schema.
Xavier Ducrohet [Thu, 15 Oct 2009 18:07:41 +0000 (11:07 -0700)]
WQVGA skin (240x400) (do not merge)