Commit Graph

2168 Commits

Author SHA1 Message Date
Xavier Ducrohet
0094ad1ab4 am a6aae918: am 37240333: Merge change 26436 into eclair
Merge commit 'a6aae9183198f7725b34cf8686cb4640af560fd6'

* commit 'a6aae9183198f7725b34cf8686cb4640af560fd6':
  Add a new skin to the SDK.
2009-09-23 11:35:31 -07:00
Piotr Gurgul
221bc2dd35 am b824d519: am 36ee5daf: Merge change 26329 into eclair
Merge commit 'b824d519146a813dff72f4baa4a1c7abbf78b962'

* commit 'b824d519146a813dff72f4baa4a1c7abbf78b962':
  Distinguish jar folders and jar files in ApkBuilder script
2009-09-23 11:29:52 -07:00
Xavier Ducrohet
a6aae91831 am 37240333: Merge change 26436 into eclair
Merge commit '3724033353aa535248659ad86f4d4c1c2a10fb75' into eclair-plus-aosp

* commit '3724033353aa535248659ad86f4d4c1c2a10fb75':
  Add a new skin to the SDK.
2009-09-22 14:28:47 -07:00
Android (Google) Code Review
3724033353 Merge change 26436 into eclair
* changes:
  Add a new skin to the SDK.
2009-09-22 17:18:17 -04:00
Xavier Ducrohet
1da1bd86b8 Add a new skin to the SDK.
Change-Id: I988a5a4bf372c0f8608facf64314ada1e9ee791e
2009-09-22 13:51:14 -07:00
Piotr Gurgul
b824d51914 am 36ee5daf: Merge change 26329 into eclair
Merge commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f' into eclair-plus-aosp

* commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f':
  Distinguish jar folders and jar files in ApkBuilder script
2009-09-22 11:52:04 -07:00
Android (Google) Code Review
36ee5dafd0 Merge change 26329 into eclair
* changes:
  Distinguish jar folders and jar files in ApkBuilder script
2009-09-22 14:44:28 -04:00
Piotr Gurgul
a9841ee872 am d176d42d: am 3cbe2b79: Add automatic application package extraction from manifest
Merge commit 'd176d42d6716072da81c4334c53b99c2201ef0f2'

* commit 'd176d42d6716072da81c4334c53b99c2201ef0f2':
  Add automatic application package extraction from manifest
2009-09-22 11:31:51 -07:00
Piotr Gurgul
666d24cc3c Distinguish jar folders and jar files in ApkBuilder script
Checking if -rj parameter value is a directory or a file
and calling the appropriate function for each of them.
2009-09-22 11:28:43 -07:00
Piotr Gurgul
d176d42d67 am 3cbe2b79: Add automatic application package extraction from manifest
Merge commit '3cbe2b7943c0437ffb8c2a03a679c0ca8b9f527e' into eclair-plus-aosp

* commit '3cbe2b7943c0437ffb8c2a03a679c0ca8b9f527e':
  Add automatic application package extraction from manifest
2009-09-22 11:21:16 -07:00
Piotr Gurgul
3cbe2b7943 Add automatic application package extraction from manifest
Automatic extraction of the application.package property has been added
leveradging xpath ant task. This reduces redundancy, removes hardcoded
application.package and solves bug with uninstalling test application
package. In order to function properly needs removing application.package
from build.properties file.
2009-09-21 21:44:00 -07:00
Brett Chabot
aa43a95aa6 am f0a3ecf8: am 780a7fa1: Merge change 26298 into eclair
Merge commit 'f0a3ecf86798284ce0d5f5b82d5bf01f0d8b7162'

* commit 'f0a3ecf86798284ce0d5f5b82d5bf01f0d8b7162':
  Add build path info to runtest --list_tests
2009-09-21 19:50:05 -07:00
Brett Chabot
f0a3ecf867 am 780a7fa1: Merge change 26298 into eclair
Merge commit '780a7fa1f51a9d42e644401ef69b79e151198794' into eclair-plus-aosp

* commit '780a7fa1f51a9d42e644401ef69b79e151198794':
  Add build path info to runtest --list_tests
2009-09-21 19:40:56 -07:00
Android (Google) Code Review
780a7fa1f5 Merge change 26298 into eclair
* changes:
  Add build path info to runtest --list_tests
2009-09-21 22:32:55 -04:00
Brett Chabot
be659c08d2 Add build path info to runtest --list_tests
BUG 2133198
2009-09-21 19:26:12 -07:00
Xavier Ducrohet
c664612088 am 61c83082: am 27e73ec5: Merge change 26291 into eclair
Merge commit '61c8308205704bdb0a95086f305e3ee7f30fa3ca'

* commit '61c8308205704bdb0a95086f305e3ee7f30fa3ca':
  Update the SDK/AVD manager toolbar icon tooltip to be consistent.
2009-09-21 17:59:25 -07:00
Piotr Gurgul
0ece2f8b3f am 2b7ecb4a: am 6440b667: Merge change 26292 into eclair
Merge commit '2b7ecb4a4956067b6a4b67f221248a7be14ecfdc'

* commit '2b7ecb4a4956067b6a4b67f221248a7be14ecfdc':
  Increase reusability of zipalign macrodef
2009-09-21 17:49:23 -07:00
Xavier Ducrohet
61c8308205 am 27e73ec5: Merge change 26291 into eclair
Merge commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c' into eclair-plus-aosp

* commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c':
  Update the SDK/AVD manager toolbar icon tooltip to be consistent.
2009-09-21 17:49:04 -07:00
Android (Google) Code Review
27e73ec55b Merge change 26291 into eclair
* changes:
  Update the SDK/AVD manager toolbar icon tooltip to be consistent.
2009-09-21 20:42:14 -04:00
Piotr Gurgul
2b7ecb4a49 am 6440b667: Merge change 26292 into eclair
Merge commit '6440b667b07f085faf5916a1c7836597ac0f6b63' into eclair-plus-aosp

* commit '6440b667b07f085faf5916a1c7836597ac0f6b63':
  Increase reusability of zipalign macrodef
2009-09-21 17:39:41 -07:00
Xavier Ducrohet
1273be6c6f am d4d74b2b: am 303d6948: Merge change 26277 into eclair
Merge commit 'd4d74b2b41450290298bb3f20e28afda432ed1b5'

* commit 'd4d74b2b41450290298bb3f20e28afda432ed1b5':
  Add an XPath Ant task to be used in the android_rules.xml file.
2009-09-21 17:39:31 -07:00
Android (Google) Code Review
6440b667b0 Merge change 26292 into eclair
* changes:
  Increase reusability of zipalign macrodef
2009-09-21 20:31:08 -04:00
Xavier Ducrohet
d4d74b2b41 am 303d6948: Merge change 26277 into eclair
Merge commit '303d694863f055f09ed9b4a1b2eebeb809a2ddad' into eclair-plus-aosp

* commit '303d694863f055f09ed9b4a1b2eebeb809a2ddad':
  Add an XPath Ant task to be used in the android_rules.xml file.
2009-09-21 17:29:44 -07:00
Piotr Gurgul
9a73cd9add Increase reusability of zipalign macrodef
debug-helper macro has been renamed to zipalign-helper to reflect better its
function. Two parameters for input and output packages have been introduced.
Macro has been additionally leveradged in 'release' target where zipalign
was previously called directly, duplicating the code.
2009-09-21 17:22:34 -07:00
Android (Google) Code Review
303d694863 Merge change 26277 into eclair
* changes:
  Add an XPath Ant task to be used in the android_rules.xml file.
2009-09-21 20:22:27 -04:00
Xavier Ducrohet
54bc097702 Update the SDK/AVD manager toolbar icon tooltip to be consistent.
Change-Id: Ie4c98537035e11543dd22b870880d52506ca1b99
2009-09-21 17:20:48 -07:00
Piotr Gurgul
52c9a28813 am 7d268ab9: am fddd720c: Add global verbosity control for SDK ant targets
Merge commit '7d268ab9b8ea81d888b255dd4f529a4c493fa276'

* commit '7d268ab9b8ea81d888b255dd4f529a4c493fa276':
  Add global verbosity control for SDK ant targets
2009-09-21 17:05:15 -07:00
Piotr Gurgul
7d268ab9b8 am fddd720c: Add global verbosity control for SDK ant targets
Merge commit 'fddd720cf2530606b86f9a18f6e397dd9988958d' into eclair-plus-aosp

* commit 'fddd720cf2530606b86f9a18f6e397dd9988958d':
  Add global verbosity control for SDK ant targets
2009-09-21 16:55:22 -07:00
Piotr Gurgul
fddd720cf2 Add global verbosity control for SDK ant targets
The user-configurable property 'verbose' has been introduced. It is set by
default to 'false' and switching in on enables verbose mode for all the
intermediate steps for a given target.
2009-09-21 16:33:30 -07:00
Xavier Ducrohet
f8caa29838 Add an XPath Ant task to be used in the android_rules.xml file.
This task is designed to run XPath expression targetting Android XML files.
It will handle the Android namespace with the 'android' prefix, and store
the result of the XPath into a property.

Change-Id: I9094f5661d5e1ef86553ee1c54bdeca62366e0cd
classname: XPathTask
classpath: anttasks.jar, sdklib.jar

Usage:
<xpathtask input="path/of/file/to/read" output="name.of.property.to.write"
    expression="/xpath/expression/to/evaluate" />
2009-09-21 16:10:37 -07:00
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