Commit Graph

2096 Commits

Author SHA1 Message Date
Derek Sollenberger
cc2e456256 am 4ccb60a8: am 33769eea: Merge change 24203 into eclair
Merge commit '4ccb60a894badfea7365e43ac87ba63e20fb5bdd'

* commit '4ccb60a894badfea7365e43ac87ba63e20fb5bdd':
  Updating samplePlugin to use java surface views.
2009-09-17 09:46:02 -07:00
Derek Sollenberger
c99110c936 am 33b4efa5: am 3b3de839: Merge change 23489 into eclair
Merge commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3'

* commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3':
  adding support for plugins to use the java view system.
2009-09-17 09:45:58 -07:00
Piotr Gurgul
395783574d am e68a5dcc: am 82f8347e: Merge change 25163 into eclair
Merge commit 'e68a5dcc9164af305cbde4d4350c01adc98c830b'

* commit 'e68a5dcc9164af305cbde4d4350c01adc98c830b':
  Replace -no-sign and -debug-sign with macrodef attribute
2009-09-17 09:45:53 -07:00
Xavier Ducrohet
2f7096e91e am bafb33f5: am e6fa8c19: Merge change 25140 into eclair
Merge commit 'bafb33f5dee76e33a63f5c161a8e4b1d343f8a70'

* commit 'bafb33f5dee76e33a63f5c161a8e4b1d343f8a70':
  Add 64bit SWT to Mac SDK build.
2009-09-17 06:44:10 -07:00
Piotr Gurgul
8d222603c5 am d5dbb414: am b57c64fa: Merge change 25008 into eclair
Merge commit 'd5dbb414cc45539982c58ca8a0039f3f6f6ade79'

* commit 'd5dbb414cc45539982c58ca8a0039f3f6f6ade79':
  Reorganize android_rules and android_test_rules
2009-09-17 06:43:00 -07:00
Xavier Ducrohet
a99a1cef36 am 75abfbd0: am 28e5f75c: Merge change 24918 into eclair
Merge commit '75abfbd0a575b7747279a9059d46a4741f0ca5cd'

* commit '75abfbd0a575b7747279a9059d46a4741f0ca5cd':
  Put back support for hardware.ini at the top level of an add-on.
2009-09-17 06:42:43 -07:00
Yu Shan Emily Lau
9ecc4180da am 5dacfa37: am 4b5938c3: Merge change 24989 into eclair
Merge commit '5dacfa37f186e281126e8cc58cacf0cfe2cbcb58'

* commit '5dacfa37f186e281126e8cc58cacf0cfe2cbcb58':
  modified:   src/com/android/commands/monkey/MonkeySourceScript.java
2009-09-16 18:23:04 -07:00
Raphael
adc4a6c64e am b8a1e8fb: am 973def40: Merge change 24944 into eclair
Merge commit 'b8a1e8fbce459fe850b8d5e7c0c9a3d2bf12ab04'

* commit 'b8a1e8fbce459fe850b8d5e7c0c9a3d2bf12ab04':
  SDK Updater: fix wrong error when unable to get repository.xml
2009-09-16 18:21:39 -07:00
Android (Google) Code Review
26ad3a4f05 am d54c92b3: am e336525b: Merge change 24650 into eclair
Merge commit 'd54c92b3a169c0f31d39512a5b0bc6c09a090122'

* commit 'd54c92b3a169c0f31d39512a5b0bc6c09a090122':
  Add <jarfile> tag to ApkBuilder ant task
2009-09-16 18:20:25 -07:00
Nick Pelly
c954e8640f am f7d7d272: am 48e8ca1f: Add BluetoothDebug.apk for testing and debugging Bluetooth.
Merge commit 'f7d7d27269a595a6a1d17f747d61e10409d52731'

* commit 'f7d7d27269a595a6a1d17f747d61e10409d52731':
  Add BluetoothDebug.apk for testing and debugging Bluetooth.
2009-09-16 18:17:48 -07:00
Derek Sollenberger
4ccb60a894 am 33769eea: Merge change 24203 into eclair
Merge commit '33769eea082e0fece00f9cc16995f1edba5bfeb0' into eclair-plus-aosp

* commit '33769eea082e0fece00f9cc16995f1edba5bfeb0':
  Updating samplePlugin to use java surface views.
2009-09-15 17:13:09 -07:00
Derek Sollenberger
33b4efa5cb 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.
2009-09-15 17:13:05 -07:00
Piotr Gurgul
e68a5dcc91 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
2009-09-15 17:13:00 -07:00
Android (Google) Code Review
33769eea08 Merge change 24203 into eclair
* changes:
  Updating samplePlugin to use java surface views.
2009-09-15 20:03:26 -04:00
Android (Google) Code Review
3b3de83970 Merge change 23489 into eclair
* changes:
  adding support for plugins to use the java view system.
2009-09-15 20:03:09 -04:00
Android (Google) Code Review
82f8347ee6 Merge change 25163 into eclair
* changes:
  Replace -no-sign and -debug-sign with macrodef attribute
2009-09-15 20:01:49 -04:00
Xavier Ducrohet
bafb33f5de am e6fa8c19: Merge change 25140 into eclair
Merge commit 'e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8' into eclair-plus-aosp

* commit 'e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8':
  Add 64bit SWT to Mac SDK build.
2009-09-15 16:47:59 -07:00
Piotr Gurgul
519e10746d 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.
2009-09-15 16:46:21 -07:00
Android (Google) Code Review
e6fa8c193c Merge change 25140 into eclair
* changes:
  Add 64bit SWT to Mac SDK build.
2009-09-15 19:40:06 -04:00
Derek Sollenberger
08581f1c06 Updating samplePlugin to use java surface views.
Change-Id: I1b925ce3a6aeb0bd5464a7d5711449029944d7de
2009-09-15 19:31:43 -04:00
Derek Sollenberger
16ce3cdcac adding support for plugins to use the java view system.
Change-Id: I7305300dfc09e3e0968a1e61c21a6a2cdb983594
2009-09-15 19:31:43 -04:00
Piotr Gurgul
d5dbb414cc am b57c64fa: Merge change 25008 into eclair
Merge commit 'b57c64fa71d211bafc41e08fbd020a41d5027783' into eclair-plus-aosp

* commit 'b57c64fa71d211bafc41e08fbd020a41d5027783':
  Reorganize android_rules and android_test_rules
2009-09-15 16:08:35 -07:00
Xavier Ducrohet
75abfbd0a5 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.
2009-09-15 15:59:18 -07:00
Android (Google) Code Review
b57c64fa71 Merge change 25008 into eclair
* changes:
  Reorganize android_rules and android_test_rules
2009-09-15 18:58:34 -04:00
Android (Google) Code Review
28e5f75c74 Merge change 24918 into eclair
* changes:
  Put back support for hardware.ini at the top level of an add-on.
2009-09-15 18:50:59 -04:00
Xavier Ducrohet
8ffe5c72bb Add 64bit SWT to Mac SDK build.
Change-Id: Ie30153644733d5a22453eea2c66551e4aaa03316
2009-09-15 15:45:19 -07:00
Piotr Gurgul
05bf40edec 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.
2009-09-15 14:55:32 -07:00
Yu Shan Emily Lau
5dacfa37f1 am 4b5938c3: Merge change 24989 into eclair
Merge commit '4b5938c34fb23727fe98905dc561d79f151d1439' into eclair-plus-aosp

* commit '4b5938c34fb23727fe98905dc561d79f151d1439':
  modified:   src/com/android/commands/monkey/MonkeySourceScript.java
2009-09-14 21:07:16 -07:00
Android (Google) Code Review
4b5938c34f Merge change 24989 into eclair
* changes:
  	modified:   src/com/android/commands/monkey/MonkeySourceScript.java Added the long press keyword and event.
2009-09-14 23:57:59 -04:00
Yu Shan Emily Lau
b1cc0de3c8 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
2009-09-14 19:06:18 -07:00
Raphael
b8a1e8fbce 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
2009-09-14 17:47:00 -07:00
Android (Google) Code Review
973def409f Merge change 24944 into eclair
* changes:
  SDK Updater: fix wrong error when unable to get repository.xml
2009-09-14 20:13:32 -04:00
Android (Google) Code Review
d54c92b3a1 am e336525b: Merge change 24650 into eclair
Merge commit 'e336525b2182b41548533898071417e7dc6c1c35' into eclair-plus-aosp

* commit 'e336525b2182b41548533898071417e7dc6c1c35':
  Add <jarfile> tag to ApkBuilder ant task
2009-09-14 15:58:55 -07:00
Android (Google) Code Review
e336525b21 Merge change 24650 into eclair
* changes:
  Add <jarfile> tag to ApkBuilder ant task
2009-09-14 18:48:55 -04:00
Raphael
8151879a7d SDK Updater: fix wrong error when unable to get repository.xml
BUG 2095530

Change-Id: I19622378b8da049f1c3416b8e0951ecc1f7475f0
2009-09-14 15:35:54 -07:00
Android (Google) Code Review
3c8abc50a0 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
2009-09-14 14:44:54 -07:00
Xavier Ducrohet
80c767f761 Put back support for hardware.ini at the top level of an add-on.
Change-Id: Ifb4e567e69f0f5e6ffde8f98c636336cf1289e42
2009-09-14 14:14:09 -07:00
Nick Pelly
f7d7d27269 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.
2009-09-14 13:04:20 -07:00
Nick Pelly
48e8ca1f52 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
2009-09-14 12:46:20 -07:00
Raphael
88fc447265 am e6067d17: am 2196fd03: android tool: support --target symbolic target names
Merge commit 'e6067d17dc4ee3d08fd3cf99e0cf5fe074555b48'

* commit 'e6067d17dc4ee3d08fd3cf99e0cf5fe074555b48':
  android tool: support --target symbolic target names
2009-09-10 16:44:48 -07:00
Raphael
e6067d17dc 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
2009-09-10 16:26:57 -07:00
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