OSDN Git Service
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
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
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
Xavier Ducrohet [Thu, 3 Sep 2009 03:20:33 +0000 (20:20 -0700)]
am
2b6f5d17: Merge change 23740 into eclair
Merge commit '
2b6f5d17a3c3eff47cb804b1a6210cfd8a640a3d' into eclair-plus-aosp
* commit '
2b6f5d17a3c3eff47cb804b1a6210cfd8a640a3d':
Add support for opening HPROF files in Eclipse.
Android (Google) Code Review [Thu, 3 Sep 2009 03:18:12 +0000 (20:18 -0700)]
Merge change 23740 into eclair
* changes:
Add support for opening HPROF files in Eclipse.
Xavier Ducrohet [Thu, 3 Sep 2009 00:28:50 +0000 (17:28 -0700)]
Add support for opening HPROF files in Eclipse.
The action taken on successful HPROF dump can now be configured from
the plug-in preference to be either "save to disk" or "open in eclipse".
If a plug-in supporting .hprof files (such as Eclipse Memory Analyzer Tool)
is present then the file will just be opened in the tool.
"save to disk" does not convert the file, "open in eclipse" does convert
the hprof file (using hprof-conv present in the SDK)
Change-Id: Iceb347abb2af5a2979b6028c22dcbdc3bc7250ca
Xavier Ducrohet [Thu, 3 Sep 2009 03:08:11 +0000 (20:08 -0700)]
am
46093a92: Make DDMS log way less verbose.
Merge commit '
46093a9204309a241b4e83dca4b7fbcba8768959' into eclair-plus-aosp
* commit '
46093a9204309a241b4e83dca4b7fbcba8768959':
Make DDMS log way less verbose.
Xavier Ducrohet [Thu, 3 Sep 2009 01:03:01 +0000 (18:03 -0700)]
Make DDMS log way less verbose.
All the Log.i() calls were in fact debug logging, so I moved them
to Log.d()
Change-Id: I47b9cd8e85e630d61506c8c2df3baf245a706e03
Raphael [Wed, 2 Sep 2009 22:34:42 +0000 (15:34 -0700)]
am
a7bb36d1: SDK Updter: change window title to match ADT
Merge commit '
a7bb36d181639ffc1bafa9e4080ca4f5691043ba' into eclair-plus-aosp
* commit '
a7bb36d181639ffc1bafa9e4080ca4f5691043ba':
SDK Updter: change window title to match ADT
Raphael [Wed, 2 Sep 2009 22:01:18 +0000 (15:01 -0700)]
SDK Updter: change window title to match ADT
Also change the name displayed by the "android" wrapping scripts.
Change-Id: I663e1dcadfef7caf2e42138e39b1237f08091c77
Omari Stephens [Wed, 2 Sep 2009 21:20:30 +0000 (14:20 -0700)]
am
a43c57a8: Merge change 23664 into eclair
Merge commit '
a43c57a870ee74fe899a0e92beb2f1ac40150387' into eclair-plus-aosp
* commit '
a43c57a870ee74fe899a0e92beb2f1ac40150387':
Add ContactsProvider tests to runtest as 'contactsprov'
Android (Google) Code Review [Wed, 2 Sep 2009 21:19:07 +0000 (14:19 -0700)]
Merge change 23664 into eclair
* changes:
Add ContactsProvider tests to runtest as 'contactsprov'
Raphael [Wed, 2 Sep 2009 21:05:53 +0000 (14:05 -0700)]
am
b1e9793d: ADT GLE: change error display to a separate sash.
Merge commit '
b1e9793d6620ef973552f4d8672578f1276d68c2' into eclair-plus-aosp
* commit '
b1e9793d6620ef973552f4d8672578f1276d68c2':
ADT GLE: change error display to a separate sash.
Omari Stephens [Wed, 2 Sep 2009 20:01:11 +0000 (13:01 -0700)]
Add ContactsProvider tests to runtest as 'contactsprov'
Also, move GoogleContactsProvider tests from 'contactsprov' to 'gcontactsprov'
Finally, switch the gcontactsprov test to the right coverage class
Raphael [Wed, 2 Sep 2009 19:35:21 +0000 (12:35 -0700)]
ADT GLE: change error display to a separate sash.
This allows GEP to display both the latest error and the latest
successful rendering. The error still needs an icon and the
canvas will need to be grayed or something.
Also the LayoutCanvas will directly use the ILayoutResult and we
won't need to custom EditData in UiElementNode so the correspond
method is @deprecated (but obviously still supported for GLE1.)
Change-Id: Ia3afed836755dbd84a4511eaed0782c85a383ac9
Xavier Ducrohet [Wed, 2 Sep 2009 18:20:50 +0000 (11:20 -0700)]
am
34103a59: Merge change 23640 into eclair
Merge commit '
34103a59621db1de67a42f45dbeed50421ed3bce' into eclair-plus-aosp
* commit '
34103a59621db1de67a42f45dbeed50421ed3bce':
Remove unused git files.
Android (Google) Code Review [Wed, 2 Sep 2009 18:17:32 +0000 (11:17 -0700)]
Merge change 23640 into eclair
* changes:
Remove unused git files.
Xavier Ducrohet [Wed, 2 Sep 2009 18:14:04 +0000 (11:14 -0700)]
Remove unused git files.
Change-Id: I1501ae5bc5d8608f149f9d404e198aa9398b665b
Xavier Ducrohet [Wed, 2 Sep 2009 18:02:51 +0000 (11:02 -0700)]
am
5a0b7395: Merge change 23546 into eclair
Merge commit '
5a0b7395be0fc57f168fdc68bb3af68c810abcfe' into eclair-plus-aosp
* commit '
5a0b7395be0fc57f168fdc68bb3af68c810abcfe':
Add "Dump HPROF file" to DDMS/DDMS plugin
Android (Google) Code Review [Wed, 2 Sep 2009 17:54:54 +0000 (10:54 -0700)]
Merge change 23546 into eclair
* changes:
Add "Dump HPROF file" to DDMS/DDMS plugin
Debajit Ghosh [Wed, 2 Sep 2009 05:20:31 +0000 (22:20 -0700)]
fixing NPE that i see on my Mac when running idegen.sh
Eric Fischer [Wed, 2 Sep 2009 00:33:25 +0000 (17:33 -0700)]
am
0c12e21a: Merge change 23532 into eclair
Merge commit '
0c12e21a3152b62fb330c86b5ea544e927300608' into eclair-plus-aosp
* commit '
0c12e21a3152b62fb330c86b5ea544e927300608':
Add backslashes before apostrophes so they don't get lost.
Android (Google) Code Review [Wed, 2 Sep 2009 00:30:51 +0000 (17:30 -0700)]
Merge change 23532 into eclair
* changes:
Add backslashes before apostrophes so they don't get lost.
Xavier Ducrohet [Tue, 1 Sep 2009 23:23:16 +0000 (16:23 -0700)]
Add "Dump HPROF file" to DDMS/DDMS plugin
This uses the (new in cupcake) VM command through JDWP.
Older VMs are detected through the (also new) 'FEAT' command that notifies
which features the VM supports.
The hprof file is right now saved in /sdcard. Due to donut+ apps not having
the SD Card permission by default, we may need to change this in the (near)
future.
Upon completion of the dump by the VM, DDMS will give the user a file selector
to choose a place to save the file on the host machine.
Future improvements: run (our own) hat, or hprof-conv and a standard hprof
tool (Eclipse MAT integration for instance). This should be configurable
by the user.
Change-Id: I33696b0263e3d0788ad5d90cedf3cd17393d2f9b
Piotr Gurgul [Tue, 1 Sep 2009 22:54:39 +0000 (15:54 -0700)]
am
56098693: Merge change 23515 into eclair
Merge commit '
56098693d29346fc3bf995a125e12fb2d3e1523d' into eclair-plus-aosp
* commit '
56098693d29346fc3bf995a125e12fb2d3e1523d':
Update apkbuilder to support new property names
Android (Google) Code Review [Tue, 1 Sep 2009 22:52:35 +0000 (15:52 -0700)]
Merge change 23515 into eclair
* changes:
Update apkbuilder to support new property names
Eric Fischer [Tue, 1 Sep 2009 22:42:46 +0000 (15:42 -0700)]
Add backslashes before apostrophes so they don't get lost.
This is required by another change I am about to submit that makes it
an error not to include the backslash, since it is inevitably a mistake
when someone fails to include it.
Piotr Gurgul [Tue, 1 Sep 2009 21:50:43 +0000 (14:50 -0700)]
Update apkbuilder to support new property names
out.debug.unaligned.package property name has not been updated in
ApkBuilderTask.java and that is why ApkBuilder misbehaved
BUG:
2090896
Xavier Ducrohet [Tue, 1 Sep 2009 18:59:21 +0000 (11:59 -0700)]
am
6ef45eb8: Merge change 23388 into eclair
Merge commit '
6ef45eb862a8eb0f03fbd6b1c915ec03fc28f1e9' into eclair-plus-aosp
* commit '
6ef45eb862a8eb0f03fbd6b1c915ec03fc28f1e9':
DDMS now queries the VM for its features.
Android (Google) Code Review [Tue, 1 Sep 2009 18:57:14 +0000 (11:57 -0700)]
Merge change 23388 into eclair
* changes:
DDMS now queries the VM for its features.
Brett Chabot [Tue, 1 Sep 2009 18:18:09 +0000 (11:18 -0700)]
am
b8b984d0: Merge change 23420 into eclair
Merge commit '
b8b984d0776ad0f34d94e41938fa12086bf2dc59' into eclair-plus-aosp
* commit '
b8b984d0776ad0f34d94e41938fa12086bf2dc59':
ADT: change continuous test ant script to run both functional and unit tests.
Android (Google) Code Review [Tue, 1 Sep 2009 18:16:31 +0000 (11:16 -0700)]
Merge change 23420 into eclair
* changes:
ADT: change continuous test ant script to run both functional and unit tests.
Jean-Baptiste Queru [Tue, 1 Sep 2009 15:27:45 +0000 (08:27 -0700)]
merge from open-source master
Brett Chabot [Tue, 1 Sep 2009 08:06:47 +0000 (01:06 -0700)]
ADT: change continuous test ant script to run both functional and unit tests.
Scott Main [Tue, 1 Sep 2009 02:36:23 +0000 (19:36 -0700)]
am
50992e80: docs only. add a homepage for the searchable dictionary sample app. and make all urls relative
Merge commit '
50992e805e758e2231f28ec2127b57a1a9fd0ddc' into eclair
* commit '
50992e805e758e2231f28ec2127b57a1a9fd0ddc':
docs only.
Xavier Ducrohet [Tue, 1 Sep 2009 01:02:44 +0000 (18:02 -0700)]
DDMS now queries the VM for its features.
This is a first step to support method profiling on/off and hprof dump from
DDMS.
Change-Id: Id95767b458a8405a31bcbe295bb969597f0e6e03
Scott Main [Sat, 29 Aug 2009 20:08:18 +0000 (13:08 -0700)]
docs only.
add a homepage for the searchable dictionary sample app.
and make all urls relative
Mike LeBeau [Fri, 28 Aug 2009 17:53:53 +0000 (10:53 -0700)]
am
67545123: Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
Merge commit '
67545123a4188c714fbcf24e7fe1cf1f614b610c' into eclair
* commit '
67545123a4188c714fbcf24e7fe1cf1f614b610c':
Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
Mike LeBeau [Fri, 28 Aug 2009 02:13:43 +0000 (19:13 -0700)]
Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
This reverts commit
3e83e8bc8b969a993b026dab9d13b99b315d9af0.
Mike LeBeau [Fri, 28 Aug 2009 17:35:46 +0000 (10:35 -0700)]
Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
This reverts commit
3e83e8bc8b969a993b026dab9d13b99b315d9af0.
Dianne Hackborn [Fri, 28 Aug 2009 03:13:19 +0000 (20:13 -0700)]
Add sample of correctly requesting camera feature, optional shared lib.
Change-Id: I5697e70cedeba9de6458caf50a363057278a7387
Raphael [Thu, 27 Aug 2009 06:28:05 +0000 (23:28 -0700)]
ADT: GraphicalEditorPart is the new GLE2.
This CL represents the base for the new "Graphical Editor Part".
First, GLE2 has been renamed in GraphicalEditorPart. That's the
final name, I swear I won't change it again (until next month that is.)
The editor part has 3 composites: the top ConfigConfiguration
(same as usual, reused as-is), a new PaletteComposite and a new
LayoutCanavas. This last one displays the rendering image and
will deal with interactivity.
The LayoutCanvas is actually stacked with a label which displays
the rendering error. After a rendering, either the error or the
canvas is visible, depending on the success of the operation.
That would make it easier to have a different mechanism, for example
the error could be next to the last known rendering, they don't
have to be mutually exclusive.
It is worth noting that GraphicalEditorPart is 95% similar to
the GLE1, reusing all the glue code that we had to handle
layout requestes, refresh requests, sdk/framework load listeners,
configuration and file input changes, etc.
Both PaletteComposite and LayoutCanvas are currently embryonic
at best, just to make sure the editor part is structured correctly.
Change-Id: I36c2ae4d85a68e68a349adc63a718f06375e12c5
Brett Chabot [Thu, 27 Aug 2009 00:46:15 +0000 (17:46 -0700)]
am
aa1be08c: Merge change 22791 into donut
Merge commit '
aa1be08c90507e20c1ee78d0c7cbd4fa5c40a799' into eclair
* commit '
aa1be08c90507e20c1ee78d0c7cbd4fa5c40a799':
Add test definition for cts-gesture.
Android (Google) Code Review [Thu, 27 Aug 2009 00:44:09 +0000 (17:44 -0700)]
Merge change 22791 into donut
* changes:
Add test definition for cts-gesture.
Xavier Ducrohet [Wed, 26 Aug 2009 03:01:56 +0000 (20:01 -0700)]
Make ApkBuilder create filenames supported by older rules.
'ant install' must know the debug apk filename so newer naming scheme breaks
on older rule files (1.5 and earlier).
The fix is to check for the presence of the property naming the debug,
signed, unaligned package. If the property is present, then we use
the new naming scheme ({base}[-{config}]-debug-unaligned.apk), else we use
the old one ({base}-[-{config}]-debug.apk).
Also merge the install/reinstall targets, since 'adb install -r <file>'
works even if the apk was not yet installed.
Change-Id: Id0670610a6539a3f48c955756955f950039c3cd0
Brett Chabot [Wed, 26 Aug 2009 18:58:23 +0000 (11:58 -0700)]
Add test definition for cts-gesture.
BUG
2048364
Change-Id: I71b2cc197a9f6809dfb863d919a7fdeae75bd411
Xavier Ducrohet [Wed, 26 Aug 2009 18:41:53 +0000 (11:41 -0700)]
am
3a92963b: Merge change 22652 into donut
Merge commit '
3a92963bf3865330e89b3e7a66b66dd9cfc8792b' into eclair
* commit '
3a92963bf3865330e89b3e7a66b66dd9cfc8792b':
Cleanup SDK packaging: remove alias build files.
Xavier Ducrohet [Wed, 26 Aug 2009 18:41:50 +0000 (11:41 -0700)]
am
aa1abe87: (-s ours) Make ApkBuilder create filenames supported by older rules.
Merge commit '
aa1abe879a53e1d25b8a95f677a920938097f3c9' into eclair
* commit '
aa1abe879a53e1d25b8a95f677a920938097f3c9':
Make ApkBuilder create filenames supported by older rules.
Android Code Review [Wed, 26 Aug 2009 18:26:45 +0000 (11:26 -0700)]
Merge change 6506
* changes:
Updated to better distinguish between options and operands
Android (Google) Code Review [Wed, 26 Aug 2009 18:26:06 +0000 (11:26 -0700)]
Merge change 22652 into donut
* changes:
Cleanup SDK packaging: remove alias build files.
Xavier Ducrohet [Tue, 25 Aug 2009 21:49:43 +0000 (14:49 -0700)]
Cleanup SDK packaging: remove alias build files.
Xavier Ducrohet [Wed, 26 Aug 2009 03:01:56 +0000 (20:01 -0700)]
Make ApkBuilder create filenames supported by older rules.
'ant install' must know the debug apk filename so newer naming scheme breaks
on older rule files (1.5 and earlier).
The fix is to check for the presence of the property naming the debug,
signed, unaligned package. If the property is present, then we use
the new naming scheme ({base}[-{config}]-debug-unaligned.apk), else we use
the old one ({base}-[-{config}]-debug.apk).
Also merge the install/reinstall targets, since 'adb install -r <file>'
works even if the apk was not yet installed.
DO NOT MERGE
Nate Karstens [Sat, 3 Jan 2009 17:15:22 +0000 (11:15 -0600)]
Updated to better distinguish between options and operands
Muthu Ramadoss [Fri, 7 Nov 2008 10:47:09 +0000 (16:17 +0530)]
Enhancement: ApiDemos - App - Dialog - AlertDialog with MultipleChoices backed by Cursor
Added an example for using AlertDialog in Multichoice mode backed up by Cursor. This example can be used to test the following bug: http://code.google.com/p/android/issues/detail?id=955
AMEND:
Added a Toast to display readonly status of cursor, so data will not be updated.
Removed empty code blocks, which did nothing.
Xavier Ducrohet [Wed, 26 Aug 2009 01:11:28 +0000 (18:11 -0700)]
Make sure older rules files can find the SDK Location.
Change-Id: Idb2463f07c233015927181e79955ae71e10dcb19
Android (Google) Code Review [Wed, 26 Aug 2009 00:27:37 +0000 (17:27 -0700)]
Merge change 22697 into eclair
* changes:
Ant clean target added
Piotr Gurgul [Wed, 26 Aug 2009 00:19:00 +0000 (17:19 -0700)]
Ant clean target added
Removes output files created by other targets.
Xavier Ducrohet [Mon, 24 Aug 2009 18:07:51 +0000 (11:07 -0700)]
Move from arbitrary resource filters to fix ones
Resource filters are used when generating additional APK containing only
specific resources.
The previous UI allowed for any type of filters, but we are moving to a
simpler way with fixed filters.
The first one is the density. Selecting the filter will generate 4 APKs per
application: default (all resources), hdpi (only hdpi/nodpi and default
resources), mdpi, ldpi.