OSDN Git Service
Derek Sollenberger [Mon, 21 Sep 2009 17:42:56 +0000 (10:42 -0700)]
am
4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName
Merge commit '
4a9200d0945cd5eb4cfe7a8721c70eeec67e528e' into eclair-plus-aosp
* commit '
4a9200d0945cd5eb4cfe7a8721c70eeec67e528e':
renaming setJavaClassName to setPluginStubJavaClassName
Derek Sollenberger [Mon, 21 Sep 2009 13:15:38 +0000 (09:15 -0400)]
renaming setJavaClassName to setPluginStubJavaClassName
Change-Id: I1a962ed93e27615611a248b8791d3392ba36df1e
Jaikumar Ganesh [Sat, 19 Sep 2009 19:06:10 +0000 (12:06 -0700)]
am
bcdcd9d4: Merge change 25854 into eclair
Merge commit '
bcdcd9d4d50e50360c2ac89526dd79f30f50ac9f' into eclair-plus-aosp
* commit '
bcdcd9d4d50e50360c2ac89526dd79f30f50ac9f':
Add UUID intent to BluetoothDebug app.
Android (Google) Code Review [Sat, 19 Sep 2009 18:58:41 +0000 (14:58 -0400)]
Merge change 25854 into eclair
* changes:
Add UUID intent to BluetoothDebug app.
David 'Digit' Turner [Sat, 19 Sep 2009 07:07:40 +0000 (00:07 -0700)]
am
4d31089b: Merge change 25645 into eclair
Merge commit '
4d31089b9d3e990791a14828f899e4843443a184' into eclair-plus-aosp
* commit '
4d31089b9d3e990791a14828f899e4843443a184':
Fix the skins to do proper dpad rotation in landscape mode.
Android (Google) Code Review [Sat, 19 Sep 2009 07:01:15 +0000 (03:01 -0400)]
Merge change 25645 into eclair
* changes:
Fix the skins to do proper dpad rotation in landscape mode.
Jaikumar Ganesh [Fri, 18 Sep 2009 23:08:18 +0000 (16:08 -0700)]
Add UUID intent to BluetoothDebug app.
Change-Id: If1198f4f03eb261afe29f4c363924033aa49a477
Piotr Gurgul [Fri, 18 Sep 2009 03:08:43 +0000 (20:08 -0700)]
am
fbc5cc74: Merge change 25692 into eclair
Merge commit '
fbc5cc7488204b9b74acc587efa3c5d76a52c58b' into eclair-plus-aosp
* commit '
fbc5cc7488204b9b74acc587efa3c5d76a52c58b':
Fix a bug in processing jarfolders in ApkBuilder
Android (Google) Code Review [Fri, 18 Sep 2009 03:01:49 +0000 (23:01 -0400)]
Merge change 25692 into eclair
* changes:
Fix a bug in processing jarfolders in ApkBuilder
Piotr Gurgul [Fri, 18 Sep 2009 02:42:01 +0000 (19:42 -0700)]
Fix a bug in processing jarfolders in ApkBuilder
Wrong parameter has been passed to the function which resulted
in exception.
http://b/issue?id=
2127927
David 'Digit' Turner [Fri, 18 Sep 2009 00:19:09 +0000 (17:19 -0700)]
Fix the skins to do proper dpad rotation in landscape mode.
Eric Fischer [Thu, 17 Sep 2009 22:08:52 +0000 (15:08 -0700)]
am
9cc8b3f0: Import revised translations. DO NOT MERGE
Merge commit '
9cc8b3f04494cce6b37761eccb259d781dbb5ad6' into eclair-plus-aosp
* commit '
9cc8b3f04494cce6b37761eccb259d781dbb5ad6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:27:17 +0000 (14:27 -0700)]
Import revised translations. DO NOT MERGE
Patrick Scott [Thu, 17 Sep 2009 20:09:39 +0000 (13:09 -0700)]
am
107621ad: Merge change 25538 into eclair
Merge commit '
107621ad3120121bfd0eec59f2069995fbe27b0b' into eclair-plus-aosp
* commit '
107621ad3120121bfd0eec59f2069995fbe27b0b':
Do not install libsampleplugin by default.
Android (Google) Code Review [Thu, 17 Sep 2009 20:01:19 +0000 (16:01 -0400)]
Merge change 25538 into eclair
* changes:
Do not install libsampleplugin by default.
Piotr Gurgul [Thu, 17 Sep 2009 19:31:02 +0000 (12:31 -0700)]
am
13130ae0: Merge change 25340 into eclair
Merge commit '
13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3' into eclair-plus-aosp
* commit '
13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3':
Specify emma dump file location on the device explicitly
Android (Google) Code Review [Thu, 17 Sep 2009 19:23:23 +0000 (15:23 -0400)]
Merge change 25340 into eclair
* changes:
Specify emma dump file location on the device explicitly
Patrick Scott [Thu, 17 Sep 2009 19:06:19 +0000 (15:06 -0400)]
Do not install libsampleplugin by default.
This avoids installing the library during a normal build. When building
SampleBrowserPlugin, the library will be packaged in the apk.
Xavier Ducrohet [Thu, 17 Sep 2009 15:43:26 +0000 (08:43 -0700)]
am
8399a2bf: Merge change 25229 into eclair
Merge commit '
8399a2bf6d415dc20788167b70b98e24b285466d' into eclair-plus-aosp
* commit '
8399a2bf6d415dc20788167b70b98e24b285466d':
Add support for new framebuffer protocol over adb.
Android (Google) Code Review [Thu, 17 Sep 2009 00:11:48 +0000 (20:11 -0400)]
Merge change 25229 into eclair
* changes:
Add support for new framebuffer protocol over adb.
Piotr Gurgul [Wed, 16 Sep 2009 20:29:07 +0000 (13:29 -0700)]
Specify emma dump file location on the device explicitly
This is to avoid using default location for the emma dump file (coverage.ec)
which is generated on the device. Pointing out the custom location (which
for now is the same as the default one) is more straightforward and
will be important if the default location changes in the future.
Xavier Ducrohet [Wed, 16 Sep 2009 03:09:08 +0000 (20:09 -0700)]
Add support for new framebuffer protocol over adb.
This is backward compatible with the original protocol.
Change-Id: I93e811cb7775a10af82e70f31ae66d4cd74636b5
Piotr Gurgul [Wed, 16 Sep 2009 19:15:12 +0000 (12:15 -0700)]
am
66e1caff: Merge change 25298 into eclair
Merge commit '
66e1caffc8c7ae8893e542ff2ee67766efcef0b5' into eclair-plus-aosp
* commit '
66e1caffc8c7ae8893e542ff2ee67766efcef0b5':
Clean up temporary files after generating coverage report
Android (Google) Code Review [Wed, 16 Sep 2009 19:04:27 +0000 (15:04 -0400)]
Merge change 25298 into eclair
* changes:
Clean up temporary files after generating coverage report
Brett Chabot [Wed, 16 Sep 2009 18:30:37 +0000 (11:30 -0700)]
am
c1d51f75: Merge change 25165 into eclair
Merge commit '
c1d51f7544c5aeaca70f1f769965a621869b5c82' into eclair-plus-aosp
* commit '
c1d51f7544c5aeaca70f1f769965a621869b5c82':
Remove IM from code coverage targets.
Android (Google) Code Review [Wed, 16 Sep 2009 18:23:10 +0000 (14:23 -0400)]
Merge change 25165 into eclair
* changes:
Remove IM from code coverage targets.
Piotr Gurgul [Wed, 16 Sep 2009 17:43:19 +0000 (10:43 -0700)]
Clean up temporary files after generating coverage report
After generating coverage report instrumentation.dir and files coverage.ec
and coverage.em are being deleted. As Emma treats both files incrementally,
running 'ant coverage' in the project with these files already existing
may produce unexpected results.
Nicolas Catania [Wed, 16 Sep 2009 02:25:33 +0000 (19:25 -0700)]
am
765bec77: Merge change 25093 into eclair
Merge commit '
765bec77d5ed3f3bbda52d1b6015fc9fd7203971' into eclair-plus-aosp
* commit '
765bec77d5ed3f3bbda52d1b6015fc9fd7203971':
Added new telephony unittest target.
Android (Google) Code Review [Wed, 16 Sep 2009 02:17:14 +0000 (22:17 -0400)]
Merge change 25093 into eclair
* changes:
Added new telephony unittest target.
Derek Sollenberger [Wed, 16 Sep 2009 00:13:09 +0000 (17:13 -0700)]
am
33769eea: Merge change 24203 into eclair
Merge commit '
33769eea082e0fece00f9cc16995f1edba5bfeb0' into eclair-plus-aosp
* commit '
33769eea082e0fece00f9cc16995f1edba5bfeb0':
Updating samplePlugin to use java surface views.
Derek Sollenberger [Wed, 16 Sep 2009 00:13:05 +0000 (17:13 -0700)]
am
3b3de839: Merge change 23489 into eclair
Merge commit '
3b3de83970037c9fec707dbdb06af2835b9f5913' into eclair-plus-aosp
* commit '
3b3de83970037c9fec707dbdb06af2835b9f5913':
adding support for plugins to use the java view system.
Piotr Gurgul [Wed, 16 Sep 2009 00:13:00 +0000 (17:13 -0700)]
am
82f8347e: Merge change 25163 into eclair
Merge commit '
82f8347ee6edf4b8fa65a06ee93ff746730cb8f0' into eclair-plus-aosp
* commit '
82f8347ee6edf4b8fa65a06ee93ff746730cb8f0':
Replace -no-sign and -debug-sign with macrodef attribute
Android (Google) Code Review [Wed, 16 Sep 2009 00:03:26 +0000 (20:03 -0400)]
Merge change 24203 into eclair
* changes:
Updating samplePlugin to use java surface views.
Android (Google) Code Review [Wed, 16 Sep 2009 00:03:09 +0000 (20:03 -0400)]
Merge change 23489 into eclair
* changes:
adding support for plugins to use the java view system.
Android (Google) Code Review [Wed, 16 Sep 2009 00:01:49 +0000 (20:01 -0400)]
Merge change 25163 into eclair
* changes:
Replace -no-sign and -debug-sign with macrodef attribute
Brett Chabot [Tue, 15 Sep 2009 23:56:37 +0000 (16:56 -0700)]
Remove IM from code coverage targets.
Necessary since IM is no longer part of the Android source tree.
Xavier Ducrohet [Tue, 15 Sep 2009 23:47:59 +0000 (16:47 -0700)]
am
e6fa8c19: Merge change 25140 into eclair
Merge commit '
e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8' into eclair-plus-aosp
* commit '
e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8':
Add 64bit SWT to Mac SDK build.
Piotr Gurgul [Tue, 15 Sep 2009 23:38:40 +0000 (16:38 -0700)]
Replace -no-sign and -debug-sign with macrodef attribute
Instead of setting property indicating if package should be signed
with debug key in separate targets, this information is being passed
as a package-helper macrodef parameter.
Android (Google) Code Review [Tue, 15 Sep 2009 23:40:06 +0000 (19:40 -0400)]
Merge change 25140 into eclair
* changes:
Add 64bit SWT to Mac SDK build.
Derek Sollenberger [Tue, 8 Sep 2009 22:36:29 +0000 (18:36 -0400)]
Updating samplePlugin to use java surface views.
Change-Id: I1b925ce3a6aeb0bd5464a7d5711449029944d7de
Derek Sollenberger [Tue, 1 Sep 2009 20:27:31 +0000 (16:27 -0400)]
adding support for plugins to use the java view system.
Change-Id: I7305300dfc09e3e0968a1e61c21a6a2cdb983594
Piotr Gurgul [Tue, 15 Sep 2009 23:08:35 +0000 (16:08 -0700)]
am
b57c64fa: Merge change 25008 into eclair
Merge commit '
b57c64fa71d211bafc41e08fbd020a41d5027783' into eclair-plus-aosp
* commit '
b57c64fa71d211bafc41e08fbd020a41d5027783':
Reorganize android_rules and android_test_rules
Xavier Ducrohet [Tue, 15 Sep 2009 22:59:18 +0000 (15:59 -0700)]
am
28e5f75c: Merge change 24918 into eclair
Merge commit '
28e5f75c74227db192476a7cec5bcb39a6bf2d54' into eclair-plus-aosp
* commit '
28e5f75c74227db192476a7cec5bcb39a6bf2d54':
Put back support for hardware.ini at the top level of an add-on.
Android (Google) Code Review [Tue, 15 Sep 2009 22:58:34 +0000 (18:58 -0400)]
Merge change 25008 into eclair
* changes:
Reorganize android_rules and android_test_rules
Android (Google) Code Review [Tue, 15 Sep 2009 22:50:59 +0000 (18:50 -0400)]
Merge change 24918 into eclair
* changes:
Put back support for hardware.ini at the top level of an add-on.
Xavier Ducrohet [Tue, 15 Sep 2009 22:45:19 +0000 (15:45 -0700)]
Add 64bit SWT to Mac SDK build.
Change-Id: Ie30153644733d5a22453eea2c66551e4aaa03316
Piotr Gurgul [Tue, 15 Sep 2009 03:42:13 +0000 (20:42 -0700)]
Reorganize android_rules and android_test_rules
Instrumentation-related targets have been moved from android_test_rules to
android_rules for better consistency. Chain of target dependencies has
been modified in order to make it more natural.
Nicolas Catania [Tue, 15 Sep 2009 02:06:34 +0000 (19:06 -0700)]
Added new telephony unittest target.
Yu Shan Emily Lau [Tue, 15 Sep 2009 04:07:16 +0000 (21:07 -0700)]
am
4b5938c3: Merge change 24989 into eclair
Merge commit '
4b5938c34fb23727fe98905dc561d79f151d1439' into eclair-plus-aosp
* commit '
4b5938c34fb23727fe98905dc561d79f151d1439':
modified: src/com/android/commands/monkey/MonkeySourceScript.java
Android (Google) Code Review [Tue, 15 Sep 2009 03:57:59 +0000 (23:57 -0400)]
Merge change 24989 into eclair
* changes:
modified: src/com/android/commands/monkey/MonkeySourceScript.java Added the long press keyword and event.
Yu Shan Emily Lau [Tue, 15 Sep 2009 01:41:05 +0000 (18:41 -0700)]
modified: src/com/android/commands/monkey/MonkeySourceScript.java
Added the long press keyword and event.
modified: src/com/android/commands/monkey/MonkeySourceScript.java
modified: src/com/android/commands/monkey/MonkeySourceScript.java
modified: src/com/android/commands/monkey/MonkeySourceScript.java
Raphael [Tue, 15 Sep 2009 00:47:00 +0000 (17:47 -0700)]
am
973def40: Merge change 24944 into eclair
Merge commit '
973def409f419f673a7a3a34ecf6fcc07531338f' into eclair-plus-aosp
* commit '
973def409f419f673a7a3a34ecf6fcc07531338f':
SDK Updater: fix wrong error when unable to get repository.xml
Android (Google) Code Review [Tue, 15 Sep 2009 00:13:32 +0000 (20:13 -0400)]
Merge change 24944 into eclair
* changes:
SDK Updater: fix wrong error when unable to get repository.xml
Android (Google) Code Review [Mon, 14 Sep 2009 22:58:55 +0000 (15:58 -0700)]
am
e336525b: Merge change 24650 into eclair
Merge commit '
e336525b2182b41548533898071417e7dc6c1c35' into eclair-plus-aosp
* commit '
e336525b2182b41548533898071417e7dc6c1c35':
Add <jarfile> tag to ApkBuilder ant task
Android (Google) Code Review [Mon, 14 Sep 2009 22:48:55 +0000 (18:48 -0400)]
Merge change 24650 into eclair
* changes:
Add <jarfile> tag to ApkBuilder ant task
Raphael [Mon, 14 Sep 2009 22:24:47 +0000 (15:24 -0700)]
SDK Updater: fix wrong error when unable to get repository.xml
BUG
2095530
Change-Id: I19622378b8da049f1c3416b8e0951ecc1f7475f0
Android (Google) Code Review [Thu, 10 Sep 2009 19:53:38 +0000 (15:53 -0400)]
Add <jarfile> tag to ApkBuilder ant task
ApkBuilder ant task accepts now the new tag - <jarfile>, used for passing
emma_device.jar to ApkBuilder.
Change-Id: I1757d265609406bc06da370ab0204018a4c8fc4d
Xavier Ducrohet [Mon, 14 Sep 2009 21:14:09 +0000 (14:14 -0700)]
Put back support for hardware.ini at the top level of an add-on.
Change-Id: Ifb4e567e69f0f5e6ffde8f98c636336cf1289e42
Nick Pelly [Mon, 14 Sep 2009 20:04:20 +0000 (13:04 -0700)]
am
48e8ca1f: Add BluetoothDebug.apk for testing and debugging Bluetooth.
Merge commit '
48e8ca1f521d33a3d9051db08d06f435906199d6' into eclair-plus-aosp
* commit '
48e8ca1f521d33a3d9051db08d06f435906199d6':
Add BluetoothDebug.apk for testing and debugging Bluetooth.
Nick Pelly [Fri, 11 Sep 2009 02:14:41 +0000 (19:14 -0700)]
Add BluetoothDebug.apk for testing and debugging Bluetooth.
Currently it just registers a receiver for all Bluetooth intents,
and prints them to logcat. For example:
BTDEBUG : a.b.device.a.FOUND
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.e.RSSI = -35
BTDEBUG : a.b.device.e.CLASS = 200404
BTDEBUG : a.b.adapter.a.DISCOVERY_FINISHED
BTDEBUG : a.b.device.a.BOND_STATE_CHANGED
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.e.BOND_STATE = 11
BTDEBUG : a.b.device.e.PREVIOUS_BOND_STATE = 10
BTDEBUG : a.b.device.a.ACL_CONNECTED
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.a.NAME_CHANGED
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.e.NAME = "HBH-IV840"
This application is built by default, but is not installed. Use
mmm development/apps/BluetoothDebug
adb install -r $OUT/system/app/BluetoothDebug.apk
to install it. Logging will begin immediately.
Change-Id: I582e6415fc1c856a6a4581ecf52eda11818601cf
Raphael [Thu, 10 Sep 2009 23:26:57 +0000 (16:26 -0700)]
am
2196fd03: android tool: support --target symbolic target names
Merge commit '
2196fd03170927e813441a79cbe4642d7cdc58d6' into eclair-plus-aosp
* commit '
2196fd03170927e813441a79cbe4642d7cdc58d6':
android tool: support --target symbolic target names
Raphael [Thu, 10 Sep 2009 22:14:11 +0000 (15:14 -0700)]
android tool: support --target symbolic target names
BUG
2056746
Change-Id: I579e58f7c63cf404cd11af394f41ed7f998593ce
Yu Shan Emily Lau [Thu, 10 Sep 2009 21:41:06 +0000 (14:41 -0700)]
am
00a8a57a: Merge change 24289 into eclair
Merge commit '
00a8a57a7a74a9a69bbf690183575c9812436fab' into eclair-plus-aosp
* commit '
00a8a57a7a74a9a69bbf690183575c9812436fab':
modified: MonkeySourceScript.java
Android (Google) Code Review [Thu, 10 Sep 2009 21:31:56 +0000 (17:31 -0400)]
Merge change 24289 into eclair
* changes:
modified: MonkeySourceScript.java
Yu Shan Emily Lau [Wed, 9 Sep 2009 01:36:50 +0000 (18:36 -0700)]
modified: MonkeySourceScript.java
Raphael [Thu, 10 Sep 2009 20:43:07 +0000 (13:43 -0700)]
am
5d0e8840: Merge change 24500 into eclair
Merge commit '
5d0e8840cd8bd8b0589156998380ac36082ea82f' into eclair-plus-aosp
* commit '
5d0e8840cd8bd8b0589156998380ac36082ea82f':
ADT GLE: support multiple selection and alternate selection.
Android (Google) Code Review [Thu, 10 Sep 2009 20:35:13 +0000 (16:35 -0400)]
Merge change 24500 into eclair
* changes:
ADT GLE: support multiple selection and alternate selection.
Xavier Ducrohet [Thu, 10 Sep 2009 20:01:21 +0000 (13:01 -0700)]
am
1d2a56bb: Merge change 24455 into eclair
Merge commit '
1d2a56bb21b7800938077aa723ca9f04ec3bc614' into eclair-plus-aosp
* commit '
1d2a56bb21b7800938077aa723ca9f04ec3bc614':
Support for hardware.ini per skin in add-ons.
Android (Google) Code Review [Thu, 10 Sep 2009 19:53:38 +0000 (15:53 -0400)]
Merge change 24455 into eclair
* changes:
Support for hardware.ini per skin in add-ons.
Mike Reed [Thu, 10 Sep 2009 18:28:30 +0000 (11:28 -0700)]
am
3ac84ff0: Merge change 24187 into eclair
Merge commit '
3ac84ff02266eab2159358eafc883555d6d092be' into eclair-plus-aosp
* commit '
3ac84ff02266eab2159358eafc883555d6d092be':
add test app for ninepatch drawing
Android (Google) Code Review [Thu, 10 Sep 2009 18:20:43 +0000 (14:20 -0400)]
Merge change 24187 into eclair
* changes:
add test app for ninepatch drawing
Mike Reed [Tue, 8 Sep 2009 20:51:30 +0000 (16:51 -0400)]
add test app for ninepatch drawing
Raphael [Thu, 10 Sep 2009 06:53:01 +0000 (23:53 -0700)]
ADT GLE: support multiple selection and alternate selection.
Change-Id: Ia7ce5fb2365898fdcae73eacbaf6d08b091d7586
Piotr Gurgul [Thu, 10 Sep 2009 02:11:35 +0000 (19:11 -0700)]
am
f4c4102c: Merge change 23594 into eclair
Merge commit '
f4c4102ca9ee50b4dc157af752200a2df8c50a7b' into eclair-plus-aosp
* commit '
f4c4102ca9ee50b4dc157af752200a2df8c50a7b':
Add ant-based code coverage support to Android SDK
Android (Google) Code Review [Thu, 10 Sep 2009 02:00:52 +0000 (22:00 -0400)]
Merge change 23594 into eclair
* changes:
Add ant-based code coverage support to Android SDK
Piotr Gurgul [Wed, 2 Sep 2009 04:58:52 +0000 (21:58 -0700)]
Add ant-based code coverage support to Android SDK
Target 'run-tests' launches all the unit tests against the tested project.
Target 'coverage' emma-instruments the tested project's classes,
runs the tests against instrumented classes, collects code coverage data
and extracts it to human-readable form as report.html.
android_test_rules.xml contain additional rules for test projects.
Test projects are auto-recognized by presence of the tested.project.dir
property, which will be auto-generated for tests projects. Temporarily,
please add this property manually to the build.properties file.
Current version is mainly tested with default, android generated test projects.
This version includes also fixing relative to absolute paths for
properties which are most likely to be changed by user in external
property file.
Xavier Ducrohet [Wed, 9 Sep 2009 23:23:45 +0000 (16:23 -0700)]
Support for hardware.ini per skin in add-ons.
Change-Id: Iab230f09504a7df34faa6a27c121a79ef1ffd603
Debajit Ghosh [Wed, 9 Sep 2009 22:51:41 +0000 (15:51 -0700)]
am
e8bb54b5: Merge change 23595 into eclair
Merge commit '
e8bb54b5b79816b43d9d1652d3dac9dc7b3d7e2d' into eclair-plus-aosp
* commit '
e8bb54b5b79816b43d9d1652d3dac9dc7b3d7e2d':
fixing NPE that i see on my Mac when running idegen.sh
Android (Google) Code Review [Wed, 9 Sep 2009 22:42:18 +0000 (18:42 -0400)]
Merge change 23595 into eclair
* changes:
fixing NPE that i see on my Mac when running idegen.sh
Xavier Ducrohet [Tue, 8 Sep 2009 22:43:50 +0000 (15:43 -0700)]
am
171125f6: Add preferences to DDMS (plug-in/standalone) for adb time out.
Merge commit '
171125f67834d992db9a45eb35775d2b87b9b189' into eclair-plus-aosp
* commit '
171125f67834d992db9a45eb35775d2b87b9b189':
Add preferences to DDMS (plug-in/standalone) for adb time out.
Xavier Ducrohet [Tue, 8 Sep 2009 21:49:03 +0000 (14:49 -0700)]
am
2589180d: First pass at making adb connection timeout configurable.
Merge commit '
2589180d6d095659c1f16f8747186aec58b14ea8' into eclair-plus-aosp
* commit '
2589180d6d095659c1f16f8747186aec58b14ea8':
First pass at making adb connection timeout configurable.
Xavier Ducrohet [Tue, 8 Sep 2009 21:37:16 +0000 (14:37 -0700)]
Add preferences to DDMS (plug-in/standalone) for adb time out.
Change-Id: Ia48221e33ee5ffae4f381aa29bd99a62b148108e
Xavier Ducrohet [Tue, 8 Sep 2009 20:41:36 +0000 (13:41 -0700)]
First pass at making adb connection timeout configurable.
ddmlib has its own preference class, so the timeout will be read from there.
Change-Id: Id492372caceca0ee2c38bcfa7423bd40d20d5648
Xavier Ducrohet [Tue, 8 Sep 2009 20:37:37 +0000 (13:37 -0700)]
am
2cc97240: GLE: remove mcc/mnc, add clipping support.
Merge commit '
2cc9724024802300653c04b4d1a068f7346644ec' into eclair-plus-aosp
* commit '
2cc9724024802300653c04b4d1a068f7346644ec':
GLE: remove mcc/mnc, add clipping support.
Xavier Ducrohet [Sat, 22 Aug 2009 00:38:25 +0000 (17:38 -0700)]
GLE: remove mcc/mnc, add clipping support.
Change-Id: I9fc2ee167436ba234c6f09b1635f45b34b461c2e
Raphael [Sat, 5 Sep 2009 02:20:10 +0000 (19:20 -0700)]
am
9135db11: ADT: Display selection and mouse hover in GLE canvas.
Merge commit '
9135db1149f457d75be0492f510344b03bcf18bc' into eclair-plus-aosp
* commit '
9135db1149f457d75be0492f510344b03bcf18bc':
ADT: Display selection and mouse hover in GLE canvas.
Raphael [Sat, 5 Sep 2009 00:56:59 +0000 (17:56 -0700)]
ADT: Display selection and mouse hover in GLE canvas.
Change-Id: Icc2f8331a099905d6e1aaa52b36cc17a7190cc4b
Raphael [Sat, 5 Sep 2009 00:58:54 +0000 (17:58 -0700)]
am
0eb96d64: Merge change 24047 into eclair
Merge commit '
0eb96d6433325b54678272b485bd2b88df3b74cb' into eclair-plus-aosp
* commit '
0eb96d6433325b54678272b485bd2b88df3b74cb':
ADT: fix an NPE that can happen when an XML file resource is being
Android (Google) Code Review [Sat, 5 Sep 2009 00:56:34 +0000 (17:56 -0700)]
Merge change 24047 into eclair
* changes:
ADT: fix an NPE that can happen when an XML file resource is being refreshed by Eclipse whilst the SDK is not finished loading.
Raphael [Sat, 5 Sep 2009 00:14:37 +0000 (17:14 -0700)]
ADT: fix an NPE that can happen when an XML file resource is being
refreshed by Eclipse whilst the SDK is not finished loading.
Change-Id: I970255925d98f7b84a726fa37bf1fef3d25ab520
Xavier Ducrohet [Fri, 4 Sep 2009 23:38:48 +0000 (16:38 -0700)]
am
0b8d6908: Merge change 24031 into eclair
Merge commit '
0b8d690837afaac4077150c85c854fdefb076885' into eclair-plus-aosp
* commit '
0b8d690837afaac4077150c85c854fdefb076885':
Update revision of the tools source.properties file.
Android (Google) Code Review [Fri, 4 Sep 2009 23:36:27 +0000 (16:36 -0700)]
Merge change 24031 into eclair
* changes:
Update revision of the tools source.properties file.
Xavier Ducrohet [Fri, 4 Sep 2009 22:26:39 +0000 (15:26 -0700)]
Update revision of the tools source.properties file.
Change-Id: I02d257baf1e28ee02db262ba4772645002ea0020
Ken Shirriff [Fri, 4 Sep 2009 21:13:47 +0000 (14:13 -0700)]
am
1c3a3c3a: Merge change 23909 into eclair
Merge commit '
1c3a3c3a6173d3a647e5145730635a7d553c38d4' into eclair-plus-aosp
* commit '
1c3a3c3a6173d3a647e5145730635a7d553c38d4':
Add ddms support for contacts.
Android (Google) Code Review [Fri, 4 Sep 2009 21:11:50 +0000 (14:11 -0700)]
Merge change 23909 into eclair
* changes:
Add ddms support for contacts.
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:50:44 +0000 (07:50 -0700)]
merge from open-source master
Ken Shirriff [Thu, 3 Sep 2009 22:26:40 +0000 (15:26 -0700)]
Add ddms support for contacts.
Support the new contacts authname and the aggregation event.
Xavier Ducrohet [Thu, 3 Sep 2009 23:38:48 +0000 (16:38 -0700)]
am
3ce85131: Add method profiling support to DDMS.
Merge commit '
3ce85131be916ea334012276d136a28cf111d123' into eclair-plus-aosp
* commit '
3ce85131be916ea334012276d136a28cf111d123':
Add method profiling support to DDMS.
Xavier Ducrohet [Thu, 3 Sep 2009 03:06:08 +0000 (20:06 -0700)]
Add method profiling support to DDMS.
New button allows to start/stop tracing. When clicking stop, DDMS downloads
the trace file and starts Traceview.
Also refactored some common parts of the HPROF and tracing handlers into a
common class. The goal is to have a default, extensible implementation
of the HPROF handler that DDMS and the plug-in can reuse. This will reduce
duplicated code.
Change-Id: Ifc48926c7f6f1c3ea49a4aa94053664be83cbb06
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:12:47 +0000 (14:12 -0700)]
merge from donut
OSDN Git Service
