Derek Sollenberger
71e02ae249
am f7d831e8: am 4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName
...
Merge commit 'f7d831e876c1135b1fc73058358ce3dfb61ca304'
* commit 'f7d831e876c1135b1fc73058358ce3dfb61ca304':
renaming setJavaClassName to setPluginStubJavaClassName
2009-09-21 10:53:18 -07:00
Derek Sollenberger
f7d831e876
am 4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName
...
Merge commit '4a9200d0945cd5eb4cfe7a8721c70eeec67e528e' into eclair-plus-aosp
* commit '4a9200d0945cd5eb4cfe7a8721c70eeec67e528e':
renaming setJavaClassName to setPluginStubJavaClassName
2009-09-21 10:42:56 -07:00
Derek Sollenberger
4a9200d094
renaming setJavaClassName to setPluginStubJavaClassName
...
Change-Id: I1a962ed93e27615611a248b8791d3392ba36df1e
2009-09-21 09:15:38 -04:00
Jaikumar Ganesh
f81d65ef74
am 5c9d10e0: am bcdcd9d4: Merge change 25854 into eclair
...
Merge commit '5c9d10e085b0369016b3f53b1cae0b41f3be5999'
* commit '5c9d10e085b0369016b3f53b1cae0b41f3be5999':
Add UUID intent to BluetoothDebug app.
2009-09-19 12:15:39 -07:00
Jaikumar Ganesh
5c9d10e085
am bcdcd9d4: Merge change 25854 into eclair
...
Merge commit 'bcdcd9d4d50e50360c2ac89526dd79f30f50ac9f' into eclair-plus-aosp
* commit 'bcdcd9d4d50e50360c2ac89526dd79f30f50ac9f':
Add UUID intent to BluetoothDebug app.
2009-09-19 12:06:10 -07:00
Android (Google) Code Review
bcdcd9d4d5
Merge change 25854 into eclair
...
* changes:
Add UUID intent to BluetoothDebug app.
2009-09-19 14:58:41 -04:00
David 'Digit' Turner
b02e35c615
am efae774f: am 4d31089b: Merge change 25645 into eclair
...
Merge commit 'efae774fbdbc5b36d6903bcbe41522c6efa45861'
* commit 'efae774fbdbc5b36d6903bcbe41522c6efa45861':
Fix the skins to do proper dpad rotation in landscape mode.
2009-09-19 00:17:17 -07:00
David 'Digit' Turner
efae774fbd
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.
2009-09-19 00:07:40 -07:00
Android (Google) Code Review
4d31089b9d
Merge change 25645 into eclair
...
* changes:
Fix the skins to do proper dpad rotation in landscape mode.
2009-09-19 03:01:15 -04:00
Jaikumar Ganesh
32de5900b1
Add UUID intent to BluetoothDebug app.
...
Change-Id: If1198f4f03eb261afe29f4c363924033aa49a477
2009-09-18 16:08:18 -07:00
Piotr Gurgul
9f81f69862
am 6c324cbb: am fbc5cc74: Merge change 25692 into eclair
...
Merge commit '6c324cbb238f929103c23a9ee724f694657264d8'
* commit '6c324cbb238f929103c23a9ee724f694657264d8':
Fix a bug in processing jarfolders in ApkBuilder
2009-09-17 20:18:23 -07:00
Piotr Gurgul
6c324cbb23
am fbc5cc74: Merge change 25692 into eclair
...
Merge commit 'fbc5cc7488204b9b74acc587efa3c5d76a52c58b' into eclair-plus-aosp
* commit 'fbc5cc7488204b9b74acc587efa3c5d76a52c58b':
Fix a bug in processing jarfolders in ApkBuilder
2009-09-17 20:08:43 -07:00
Android (Google) Code Review
fbc5cc7488
Merge change 25692 into eclair
...
* changes:
Fix a bug in processing jarfolders in ApkBuilder
2009-09-17 23:01:49 -04:00
Piotr Gurgul
46ec8be0cb
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
2009-09-17 19:42:01 -07:00
David 'Digit' Turner
f1a703f338
Fix the skins to do proper dpad rotation in landscape mode.
2009-09-17 17:19:09 -07:00
Eric Fischer
4c0cacae3d
am 1b402a46: (-s ours) am 9cc8b3f0: Import revised translations. DO NOT MERGE
...
Merge commit '1b402a46e3e2c4d8653bcab4cce84652bc389b31'
* commit '1b402a46e3e2c4d8653bcab4cce84652bc389b31':
Import revised translations. DO NOT MERGE
2009-09-17 15:19:40 -07:00
Eric Fischer
1b402a46e3
am 9cc8b3f0: Import revised translations. DO NOT MERGE
...
Merge commit '9cc8b3f04494cce6b37761eccb259d781dbb5ad6' into eclair-plus-aosp
* commit '9cc8b3f04494cce6b37761eccb259d781dbb5ad6':
Import revised translations. DO NOT MERGE
2009-09-17 15:08:52 -07:00
Eric Fischer
9cc8b3f044
Import revised translations. DO NOT MERGE
2009-09-17 14:27:17 -07:00
Patrick Scott
0f21d65744
am 967b58be: am 107621ad: Merge change 25538 into eclair
...
Merge commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4'
* commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4':
Do not install libsampleplugin by default.
2009-09-17 13:20:14 -07:00
Patrick Scott
967b58bed3
am 107621ad: Merge change 25538 into eclair
...
Merge commit '107621ad3120121bfd0eec59f2069995fbe27b0b' into eclair-plus-aosp
* commit '107621ad3120121bfd0eec59f2069995fbe27b0b':
Do not install libsampleplugin by default.
2009-09-17 13:09:39 -07:00
Android (Google) Code Review
107621ad31
Merge change 25538 into eclair
...
* changes:
Do not install libsampleplugin by default.
2009-09-17 16:01:19 -04:00
Piotr Gurgul
25e982ec3d
am 672637fc: am 13130ae0: Merge change 25340 into eclair
...
Merge commit '672637fc74a3f3749092e5804337f0b1139469de'
* commit '672637fc74a3f3749092e5804337f0b1139469de':
Specify emma dump file location on the device explicitly
2009-09-17 12:41:04 -07:00
Piotr Gurgul
672637fc74
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
2009-09-17 12:31:02 -07:00
Android (Google) Code Review
13130ae08d
Merge change 25340 into eclair
...
* changes:
Specify emma dump file location on the device explicitly
2009-09-17 15:23:23 -04:00
Patrick Scott
4a8c3bf380
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.
2009-09-17 15:07:35 -04:00
Xavier Ducrohet
9d1ea460c2
am d79bf057: am 8399a2bf: Merge change 25229 into eclair
...
Merge commit 'd79bf0574736a16f392bc8a157fae357155224c0'
* commit 'd79bf0574736a16f392bc8a157fae357155224c0':
Add support for new framebuffer protocol over adb.
2009-09-17 10:00:47 -07:00
Piotr Gurgul
b80d651d60
am 28f2b46c: am 66e1caff: Merge change 25298 into eclair
...
Merge commit '28f2b46cf46ab11fcd3d0ac1ebe3efbc53582be6'
* commit '28f2b46cf46ab11fcd3d0ac1ebe3efbc53582be6':
Clean up temporary files after generating coverage report
2009-09-17 09:58:02 -07:00
Brett Chabot
680fd375e4
am 9b22731e: am c1d51f75: Merge change 25165 into eclair
...
Merge commit '9b22731eb9783003c49f9b9a34a7d1cc6100135f'
* commit '9b22731eb9783003c49f9b9a34a7d1cc6100135f':
Remove IM from code coverage targets.
2009-09-17 09:57:07 -07:00
Nicolas Catania
86797d39cf
am fa654825: am 765bec77: Merge change 25093 into eclair
...
Merge commit 'fa654825b7292ab1e34e0450887dfacad356dd24'
* commit 'fa654825b7292ab1e34e0450887dfacad356dd24':
Added new telephony unittest target.
2009-09-17 09:49:24 -07:00
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
d79bf05747
am 8399a2bf: Merge change 25229 into eclair
...
Merge commit '8399a2bf6d415dc20788167b70b98e24b285466d' into eclair-plus-aosp
* commit '8399a2bf6d415dc20788167b70b98e24b285466d':
Add support for new framebuffer protocol over adb.
2009-09-17 08:43:26 -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
Android (Google) Code Review
8399a2bf6d
Merge change 25229 into eclair
...
* changes:
Add support for new framebuffer protocol over adb.
2009-09-16 20:11:48 -04:00
Piotr Gurgul
089585b7c6
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.
2009-09-16 16:32:57 -07:00
Xavier Ducrohet
7b88b7525b
Add support for new framebuffer protocol over adb.
...
This is backward compatible with the original protocol.
Change-Id: I93e811cb7775a10af82e70f31ae66d4cd74636b5
2009-09-16 16:30:50 -07:00
Piotr Gurgul
28f2b46cf4
am 66e1caff: Merge change 25298 into eclair
...
Merge commit '66e1caffc8c7ae8893e542ff2ee67766efcef0b5' into eclair-plus-aosp
* commit '66e1caffc8c7ae8893e542ff2ee67766efcef0b5':
Clean up temporary files after generating coverage report
2009-09-16 12:15:12 -07:00
Android (Google) Code Review
66e1caffc8
Merge change 25298 into eclair
...
* changes:
Clean up temporary files after generating coverage report
2009-09-16 15:04:27 -04:00
Brett Chabot
9b22731eb9
am c1d51f75: Merge change 25165 into eclair
...
Merge commit 'c1d51f7544c5aeaca70f1f769965a621869b5c82' into eclair-plus-aosp
* commit 'c1d51f7544c5aeaca70f1f769965a621869b5c82':
Remove IM from code coverage targets.
2009-09-16 11:30:37 -07:00
Android (Google) Code Review
c1d51f7544
Merge change 25165 into eclair
...
* changes:
Remove IM from code coverage targets.
2009-09-16 14:23:10 -04:00
Piotr Gurgul
aead155ef2
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.
2009-09-16 10:43:19 -07:00
Nicolas Catania
fa654825b7
am 765bec77: Merge change 25093 into eclair
...
Merge commit '765bec77d5ed3f3bbda52d1b6015fc9fd7203971' into eclair-plus-aosp
* commit '765bec77d5ed3f3bbda52d1b6015fc9fd7203971':
Added new telephony unittest target.
2009-09-15 19:25:33 -07:00
Android (Google) Code Review
765bec77d5
Merge change 25093 into eclair
...
* changes:
Added new telephony unittest target.
2009-09-15 22:17:14 -04:00