Commit Graph

2305 Commits

Author SHA1 Message Date
Raphael
2196fd0317 android tool: support --target symbolic target names
BUG 2056746

Change-Id: I579e58f7c63cf404cd11af394f41ed7f998593ce
2009-09-10 16:06:32 -07:00
Yu Shan Emily Lau
adcd208882 am a361f2a5: am 00a8a57a: Merge change 24289 into eclair
Merge commit 'a361f2a59ff0c6c0ac40ff53b0b605362a65e67f'

* commit 'a361f2a59ff0c6c0ac40ff53b0b605362a65e67f':
  modified:   MonkeySourceScript.java
2009-09-10 14:50:48 -07:00
Yu Shan Emily Lau
a361f2a59f am 00a8a57a: Merge change 24289 into eclair
Merge commit '00a8a57a7a74a9a69bbf690183575c9812436fab' into eclair-plus-aosp

* commit '00a8a57a7a74a9a69bbf690183575c9812436fab':
  modified:   MonkeySourceScript.java
2009-09-10 14:41:06 -07:00
Android (Google) Code Review
00a8a57a7a Merge change 24289 into eclair
* changes:
  	modified:   MonkeySourceScript.java
2009-09-10 17:31:56 -04:00
Yu Shan Emily Lau
68e2fd5272 modified: MonkeySourceScript.java 2009-09-10 14:24:02 -07:00
Raphael
71071be1c9 am c5b2512b: am 5d0e8840: Merge change 24500 into eclair
Merge commit 'c5b2512bd88439a1b39ae2955e6ec69b78ee488d'

* commit 'c5b2512bd88439a1b39ae2955e6ec69b78ee488d':
  ADT GLE: support multiple selection and alternate selection.
2009-09-10 13:52:14 -07:00
Raphael
c5b2512bd8 am 5d0e8840: Merge change 24500 into eclair
Merge commit '5d0e8840cd8bd8b0589156998380ac36082ea82f' into eclair-plus-aosp

* commit '5d0e8840cd8bd8b0589156998380ac36082ea82f':
  ADT GLE: support multiple selection and alternate selection.
2009-09-10 13:43:07 -07:00
Android (Google) Code Review
5d0e8840cd Merge change 24500 into eclair
* changes:
  ADT GLE: support multiple selection and alternate selection.
2009-09-10 16:35:13 -04:00
Xavier Ducrohet
4eea6fb66e am 470d4ebd: am 1d2a56bb: Merge change 24455 into eclair
Merge commit '470d4ebd226e3cd3140d936d0e5a853ff48f674b'

* commit '470d4ebd226e3cd3140d936d0e5a853ff48f674b':
  Support for hardware.ini per skin in add-ons.
2009-09-10 13:11:17 -07:00
Xavier Ducrohet
470d4ebd22 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.
2009-09-10 13:01:21 -07:00
Android (Google) Code Review
1d2a56bb21 Merge change 24455 into eclair
* changes:
  Support for hardware.ini per skin in add-ons.
2009-09-10 15:53:38 -04:00
Mike Reed
4b007c565a am 3c973aab: am 3ac84ff0: Merge change 24187 into eclair
Merge commit '3c973aab45d4f856446f11d852b16be83c8643ba'

* commit '3c973aab45d4f856446f11d852b16be83c8643ba':
  add test app for ninepatch drawing
2009-09-10 11:36:49 -07:00
Mike Reed
3c973aab45 am 3ac84ff0: Merge change 24187 into eclair
Merge commit '3ac84ff02266eab2159358eafc883555d6d092be' into eclair-plus-aosp

* commit '3ac84ff02266eab2159358eafc883555d6d092be':
  add test app for ninepatch drawing
2009-09-10 11:28:30 -07:00
Android (Google) Code Review
3ac84ff022 Merge change 24187 into eclair
* changes:
  add test app for ninepatch drawing
2009-09-10 14:20:43 -04:00
Mike Reed
53006ecaeb add test app for ninepatch drawing 2009-09-10 14:20:01 -04:00
Raphael
fc033f2836 ADT GLE: support multiple selection and alternate selection.
Change-Id: Ia7ce5fb2365898fdcae73eacbaf6d08b091d7586
2009-09-09 23:53:01 -07:00
Piotr Gurgul
dc481d8df8 am 4a98bd02: am f4c4102c: Merge change 23594 into eclair
Merge commit '4a98bd0286199b161b397ab58834a3baee89c4fe'

* commit '4a98bd0286199b161b397ab58834a3baee89c4fe':
  Add ant-based code coverage support to Android SDK
2009-09-09 19:20:14 -07:00
Piotr Gurgul
4a98bd0286 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
2009-09-09 19:11:35 -07:00
Android (Google) Code Review
f4c4102ca9 Merge change 23594 into eclair
* changes:
  Add ant-based code coverage support to Android SDK
2009-09-09 22:00:52 -04:00
Piotr Gurgul
6edb5a108e 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.
2009-09-09 18:32:03 -07:00
Debajit Ghosh
299c072d53 am 8fdcde0f: am e8bb54b5: Merge change 23595 into eclair
Merge commit '8fdcde0f1220c16d59c69474e78b8573cbbee018'

* commit '8fdcde0f1220c16d59c69474e78b8573cbbee018':
  fixing NPE that i see on my Mac when running idegen.sh
2009-09-09 16:31:44 -07:00
Xavier Ducrohet
e17ff22563 Support for hardware.ini per skin in add-ons.
Change-Id: Iab230f09504a7df34faa6a27c121a79ef1ffd603
2009-09-09 16:25:44 -07:00
Debajit Ghosh
8fdcde0f12 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
2009-09-09 15:51:41 -07:00
Android (Google) Code Review
e8bb54b5b7 Merge change 23595 into eclair
* changes:
  fixing NPE that i see on my Mac when running idegen.sh
2009-09-09 18:42:18 -04:00
Xavier Ducrohet
823ec623d5 am 7e4abfc5: am 171125f6: Add preferences to DDMS (plug-in/standalone) for adb time out.
Merge commit '7e4abfc52b4b97bb1619f121bfeeab3945b2fe4e'

* commit '7e4abfc52b4b97bb1619f121bfeeab3945b2fe4e':
  Add preferences to DDMS (plug-in/standalone) for adb time out.
2009-09-08 16:03:48 -07:00
Xavier Ducrohet
5b915b1ec0 am 27897997: am 2589180d: First pass at making adb connection timeout configurable.
Merge commit '2789799763e0b84b6846086e25baaca540039f8a'

* commit '2789799763e0b84b6846086e25baaca540039f8a':
  First pass at making adb connection timeout configurable.
2009-09-08 16:03:32 -07:00
Xavier Ducrohet
7e4abfc52b 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.
2009-09-08 15:43:50 -07:00
Xavier Ducrohet
2789799763 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.
2009-09-08 14:49:03 -07:00
Xavier Ducrohet
171125f678 Add preferences to DDMS (plug-in/standalone) for adb time out.
Change-Id: Ia48221e33ee5ffae4f381aa29bd99a62b148108e
2009-09-08 14:44:02 -07:00
Xavier Ducrohet
2589180d6d 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
2009-09-08 13:45:23 -07:00
Xavier Ducrohet
21b49e840f am 7add0bbe: am 2cc97240: GLE: remove mcc/mnc, add clipping support.
Merge commit '7add0bbe68c484048c86d09d8f185b966a0088bb'

* commit '7add0bbe68c484048c86d09d8f185b966a0088bb':
  GLE: remove mcc/mnc, add clipping support.
2009-09-08 13:44:52 -07:00
Xavier Ducrohet
7add0bbe68 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.
2009-09-08 13:37:37 -07:00
Xavier Ducrohet
2cc9724024 GLE: remove mcc/mnc, add clipping support.
Change-Id: I9fc2ee167436ba234c6f09b1635f45b34b461c2e
2009-09-08 11:27:56 -07:00
Raphael
cfde5b084e am 64fde38e: am 9135db11: ADT: Display selection and mouse hover in GLE canvas.
Merge commit '64fde38e2f9f05c9367dae820346d8f6493c054d'

* commit '64fde38e2f9f05c9367dae820346d8f6493c054d':
  ADT: Display selection and mouse hover in GLE canvas.
2009-09-04 19:22:02 -07:00
Raphael
64fde38e2f 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.
2009-09-04 19:20:10 -07:00
Raphael
88b9c8f6a3 am 9a3dcdea: am 0eb96d64: Merge change 24047 into eclair
Merge commit '9a3dcdea2fe5e5e785f39b57abaaa86d98a8b6bd'

* commit '9a3dcdea2fe5e5e785f39b57abaaa86d98a8b6bd':
  ADT: fix an NPE that can happen when an XML file resource is being
2009-09-04 18:00:37 -07:00
Raphael
9135db1149 ADT: Display selection and mouse hover in GLE canvas.
Change-Id: Icc2f8331a099905d6e1aaa52b36cc17a7190cc4b
2009-09-04 17:59:56 -07:00
Raphael
9a3dcdea2f 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
2009-09-04 17:58:54 -07:00
Android (Google) Code Review
0eb96d6433 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.
2009-09-04 17:56:34 -07:00
Raphael
6e1ee87955 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
2009-09-04 17:14:37 -07:00
Xavier Ducrohet
c943ff8229 am 7d5a0a5b: am 0b8d6908: Merge change 24031 into eclair
Merge commit '7d5a0a5b847939db24480d3add59e2e514f8f565'

* commit '7d5a0a5b847939db24480d3add59e2e514f8f565':
  Update revision of the tools source.properties file.
2009-09-04 16:41:28 -07:00
Xavier Ducrohet
7d5a0a5b84 am 0b8d6908: Merge change 24031 into eclair
Merge commit '0b8d690837afaac4077150c85c854fdefb076885' into eclair-plus-aosp

* commit '0b8d690837afaac4077150c85c854fdefb076885':
  Update revision of the tools source.properties file.
2009-09-04 16:38:48 -07:00
Android (Google) Code Review
0b8d690837 Merge change 24031 into eclair
* changes:
  Update revision of the tools source.properties file.
2009-09-04 16:36:27 -07:00
Xavier Ducrohet
76140555b0 Update revision of the tools source.properties file.
Change-Id: I02d257baf1e28ee02db262ba4772645002ea0020
2009-09-04 15:26:39 -07:00
Ken Shirriff
163ea4856c am 0d64d339: am 1c3a3c3a: Merge change 23909 into eclair
Merge commit '0d64d33970cb5cb34fb736521b42fbc62182fc93'

* commit '0d64d33970cb5cb34fb736521b42fbc62182fc93':
  Add ddms support for contacts.
2009-09-04 14:16:38 -07:00
Ken Shirriff
0d64d33970 am 1c3a3c3a: Merge change 23909 into eclair
Merge commit '1c3a3c3a6173d3a647e5145730635a7d553c38d4' into eclair-plus-aosp

* commit '1c3a3c3a6173d3a647e5145730635a7d553c38d4':
  Add ddms support for contacts.
2009-09-04 14:13:47 -07:00
Android (Google) Code Review
1c3a3c3a61 Merge change 23909 into eclair
* changes:
  Add ddms support for contacts.
2009-09-04 14:11:50 -07:00
Jean-Baptiste Queru
c5d815a71e am 0c16fb32: merge from open-source master
Merge commit '0c16fb3262fb0ae107da80ffee9b3343b381b679'

* commit '0c16fb3262fb0ae107da80ffee9b3343b381b679':
2009-09-04 11:05:34 -07:00
Xavier Ducrohet
a06511ce6e am 5b6c9944: am 3ce85131: Add method profiling support to DDMS.
Merge commit '5b6c9944d6145ac1563e8363103a3438f5208dae'

* commit '5b6c9944d6145ac1563e8363103a3438f5208dae':
  Add method profiling support to DDMS.
2009-09-04 11:04:31 -07:00
Jean-Baptiste Queru
0c16fb3262 merge from open-source master 2009-09-04 07:50:44 -07:00