Xavier Ducrohet
7c07042bea
am fab088f4: am 8251e4ef: Merge change Iab62c8e9 into eclair
...
Merge commit 'fab088f454ee2f2ea07cc37e21dd6209e2b9b569'
* commit 'fab088f454ee2f2ea07cc37e21dd6209e2b9b569':
Add layoutlib.jar to the classpath of adt-tests
2009-10-12 11:37:19 -07:00
Xavier Ducrohet
63d548b260
am c3bcbabd: am ee7c4739: Merge change Ic1eff784 into eclair
...
Merge commit 'c3bcbabdcf23176ac842253b60eaad02322198ad'
* commit 'c3bcbabdcf23176ac842253b60eaad02322198ad':
Fix script (and build)
2009-10-12 11:37:12 -07:00
Romain Guy
81a9c9c63d
am 104f9a74: am b7e69d20: Merge change Ic8fe0b36 into eclair
...
Merge commit '104f9a747d5ec5b7b4334ab9123dea6752a519f2'
* commit '104f9a747d5ec5b7b4334ab9123dea6752a519f2':
Add 3 more rules to layoutopt/uix:
2009-10-12 11:35:35 -07:00
Xavier Ducrohet
f033e77533
am 62611904: am 24bf2fa3: Add tests from layoutlib to adt-tests
...
Merge commit '6261190466f72703801652e7dcc69e093fba47f8'
* commit '6261190466f72703801652e7dcc69e093fba47f8':
Add tests from layoutlib to adt-tests
2009-10-12 11:35:03 -07:00
Xavier Ducrohet
60baa8afa3
am 9eb66652: am b6e85c05: Merge change Ieb4e722b into eclair
...
Merge commit '9eb66652e46d3424d42ee39897f5140a8305f609'
* commit '9eb66652e46d3424d42ee39897f5140a8305f609':
Add sdklib tests to the adt-tests Unit tests.
2009-10-12 11:33:05 -07:00
Brett Chabot
949d6e129e
am af86962d: am 6cc64cd2: Merge change I90b4c0e7 into eclair
...
Merge commit 'af86962d86160a9ab35f1bc9b4b373556ed0a099'
* commit 'af86962d86160a9ab35f1bc9b4b373556ed0a099':
Fix Eclipse sample tests.
2009-10-12 11:33:00 -07:00
Xavier Ducrohet
1b5d63be54
am 0dda405c: am e96bc57a: Merge change I7d761ffa into eclair
...
Merge commit '0dda405c6ec7ae2040f884ec71ad89bbc8ce7110'
* commit '0dda405c6ec7ae2040f884ec71ad89bbc8ce7110':
Fix best match resource selection when there's only one match.
2009-10-12 11:30:14 -07:00
Romain Guy
752f3ab16a
am 8fbe805f: am 06d3ec15: Only process XML files in layoutopt.
...
Merge commit '8fbe805f161c71e4dc471b2104484f221674de28'
* commit '8fbe805f161c71e4dc471b2104484f221674de28':
Only process XML files in layoutopt.
2009-10-12 11:30:09 -07:00
Romain Guy
fad2cff3b6
am 1db3cfa4: am d01b8dd3: Merge change I5dfb2567 into eclair
...
Merge commit '1db3cfa4f846ee01c55e3ac5e1ea0807bcde6345'
* commit '1db3cfa4f846ee01c55e3ac5e1ea0807bcde6345':
Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.
2009-10-12 11:30:04 -07:00
Romain Guy
a2ee84d03c
am 06f70393: Merge change I8e4697e1 into eclair
...
Merge commit '06f70393bd6c10c24136492a4616019822c63299'
* commit '06f70393bd6c10c24136492a4616019822c63299':
New layout optimization tool. Run layoutopt on the command line.
2009-10-12 11:25:58 -07:00
Raphael
a0f3732197
am 1061c0c7: Merge change I69afafa4 into eclair
...
Merge commit '1061c0c7dc20479626aa8b2d71485c9e17e7daf7'
* commit '1061c0c7dc20479626aa8b2d71485c9e17e7daf7':
ADT: Create project from existing sample in New Project Wizard
2009-10-12 11:23:44 -07:00
Xavier Ducrohet
3633f5c9f1
am 90ee703e: Fix resource resolution in the graphical layout editor.
...
Merge commit '90ee703e945cedaa222e8e5a2aba6333afff21b6'
* commit '90ee703e945cedaa222e8e5a2aba6333afff21b6':
Fix resource resolution in the graphical layout editor.
2009-10-12 11:23:39 -07:00
Xavier Ducrohet
3912060947
am d280d236: Monintor resolution/size chooser dialog
...
Merge commit 'd280d2363e412c43b1a7bfe044044d70d8895154'
* commit 'd280d2363e412c43b1a7bfe044044d70d8895154':
Monintor resolution/size chooser dialog
2009-10-12 11:23:34 -07:00
Xavier Ducrohet
3b10d94a49
am d13d440d: Emulator launch options dialog.
...
Merge commit 'd13d440d43a744ab6e596e52cf53eef79d222d01'
* commit 'd13d440d43a744ab6e596e52cf53eef79d222d01':
Emulator launch options dialog.
2009-10-12 11:23:30 -07:00
Xavier Ducrohet
cfa2b8acd3
am f0737030: Fix Android Manifest parser.
...
Merge commit 'f0737030570be15c1789d00db3593eb78cee9fbc'
* commit 'f0737030570be15c1789d00db3593eb78cee9fbc':
Fix Android Manifest parser.
2009-10-12 11:23:01 -07:00
Raphael
122c3dd9c6
am 2ace885b: ADT Manifest Editor: Fix for uses-sdk dup that won\'t go away.
...
Merge commit '2ace885b2945aba76266bc54ad9fa59fb4e05187'
* commit '2ace885b2945aba76266bc54ad9fa59fb4e05187':
ADT Manifest Editor: Fix for uses-sdk dup that won't go away.
2009-10-12 11:22:56 -07:00
Xavier Ducrohet
6a368fcf3e
am 227b8768: Load default GLE device profiles from the SDK.
...
Merge commit '227b8768fa8accff8a9e3555351af05d41ad7840'
* commit '227b8768fa8accff8a9e3555351af05d41ad7840':
Load default GLE device profiles from the SDK.
2009-10-12 11:22:37 -07:00
Raphael
e4c98c0191
SDK Manager: display packages revisions
...
This changes the short description of all the package types
to display the revision.
It also changes the long description to be "whatever" is in the
XML; if there's nothing in the xml, use the short description.
Also appends the requirements for addon/platform and min-tools-rev.
I will address the packaging script to put proper descriptions
when generating the XML.
SDK BUG 2136068
Change-Id: Iaca7692f048f7f63111c2fe1f25c5588f0fc2099
2009-10-11 10:13:37 -07:00
Android (Google) Code Review
e7ad6a5e40
Merge change I2fb42327 into eclair
...
* changes:
SDK Manager: extra packages must respect min-tools-rev too.
2009-10-11 12:52:46 -04:00
Android (Google) Code Review
52eb73d25c
Merge change I408e3eda into eclair
...
* changes:
SDK Manager: fix selection of non-expanded remote archives.
2009-10-11 12:51:53 -04:00
Raphael
26a2166934
Set SDK Platform/Doc to API 5.
2009-10-10 14:16:20 -07:00
Raphael
cce3d0d9ba
SDK Manager: extra packages must respect min-tools-rev too.
...
SDK BUG 2040986
Change-Id: I2fb42327ff6d474fd8ad58fcd0725af3972ea026
2009-10-09 18:45:15 -07:00
Raphael
6f9c5895a7
SDK Manager: fix selection of non-expanded remote archives.
...
SDK BUG 2177033
Change-Id: I408e3edaa5a418df871ebf0da567468bf81189df
2009-10-09 17:34:30 -07:00
Xavier Ducrohet
126a19500c
Add missing override.
...
Change-Id: Id9608b8ac9f05c3e0db92668797b2d80f0690397
2009-10-09 15:36:52 -07:00
Raphael
31d0121f68
Fix adt-tests: remove UpdaterLogicTest
...
Also reverts UpdaterLogic as package-private and
adds some javadoc to it.
SDK BUG 2179267
Change-Id: I19644cc4c99ac70598f3cbcfface2f19d9999931
2009-10-09 14:32:48 -07:00
Android (Google) Code Review
4d59d18aba
Merge change Ib18a32c1 into eclair
...
* changes:
Minor label change (size -> resolution)
2009-10-09 17:20:52 -04:00
Android (Google) Code Review
d00a9bcffe
Merge change I3e6a5048 into eclair
...
* changes:
Fix ADT tests failures: - Separate functional tests into ones which load their own Sdk, vs ones which need to use the same one as Adt. - Make all base test classes abstract with protected constructors.
2009-10-09 16:45:44 -04:00
Xavier Ducrohet
a4454504a5
Minor label change (size -> resolution)
...
Also remove unused imports
Change-Id: Ib18a32c126bc913e3e0c14546d2ce693190be1d1
2009-10-09 13:41:56 -07:00
Brett Chabot
126bc43dee
Fix ADT tests failures:
...
- Separate functional tests into ones which load their own Sdk, vs ones which
need to use the same one as Adt.
- Make all base test classes abstract with protected constructors.
BUG 2173382, 2173847
2009-10-09 12:33:22 -07:00
Android (Google) Code Review
773e9af645
Merge change Ied6c54f1 into eclair
...
* changes:
Fix continuous adt-test: UpdaterLogic is now public.
2009-10-09 15:15:45 -04:00
Raphael
8e8ad9d39f
Fix continuous adt-test: UpdaterLogic is now public.
...
Also remove the make sdkuilib from create_tests_symlinks, since
adt-tests actually uses the one from adt.
SDK BUG 2177557
Change-Id: Ied6c54f1227ed73fb77723e016559357fc1c1ee2
2009-10-09 11:50:16 -07:00
Android (Google) Code Review
264d42dd1c
Merge change Idf5bcb58 into eclair
...
* changes:
Fix ant install when -Dadb.device.arg not provided.
2009-10-09 14:45:22 -04:00
Brett Chabot
1a363965c5
Fix ant install when -Dadb.device.arg not provided.
...
And also add the adb.device.arg support to ant uninstall.
BUG 2172690
2009-10-09 11:42:14 -07:00
Android (Google) Code Review
b2fa9b713d
Merge change I2c7af74e into eclair
...
* changes:
SDK Updater: don't auto-expand archives when selecting a package
2009-10-09 13:52:36 -04:00
Raphael
38169df333
SDK Updater: don't auto-expand archives when selecting a package
...
SDK BUG 2177033
Change-Id: I2c7af74e0dbbb3fc452e15e135b656a89bde4d31
2009-10-08 16:36:41 -07:00
Raphael
3334a5874e
Fix "android create project" to properly set name in strings.xml
...
Layout was wrong too.
SDK BUG 2176634
Change-Id: Ibbec1c47037d4a6dd875953c1875daaac4f11106
2009-10-08 15:16:22 -07:00
Raphael
8eff7f5779
Support adb device-targeting arguments in ant scripts.
...
Example of usage:
$ ant install -Dadb.device.arg=-d
SDK BUG 2172690
Change-Id: I196441f9aab888b1356b4fc0255842570be5140f
2009-10-08 15:05:09 -07:00
Android (Google) Code Review
f3ae13d06f
Merge change I7d549c26 into eclair
...
* changes:
Add SdkUiLib tests to adt-tests.
2009-10-08 17:20:28 -04:00
Android (Google) Code Review
0947e82e4e
Merge change Ica46d149 into eclair
...
* changes:
SDK Updater: platform dependency on tools, addon dependency on platform.
2009-10-08 15:51:29 -04:00
Raphael
b192b0ef5b
SDK Updater: platform dependency on tools, addon dependency on platform.
...
SDK BUG 2040986
Change-Id: Ica46d14939bb3a9bf499899a0bf571456d4c6017
2009-10-08 11:55:48 -07:00
Android (Google) Code Review
9cb6feee3a
Merge change Ia20b55c7 into eclair
...
* changes:
Add hardware support to AVD creation dialog.
2009-10-08 14:35:38 -04:00
Jean-Baptiste Queru
b7c548eb23
am fb244224: merge from donut-gms
...
Merge commit 'fb244224235c33b492774f32e8caf8d43f2a3cec' into eclair
* commit 'fb244224235c33b492774f32e8caf8d43f2a3cec':
Remove unnecessary preprocessing of monkey commands, fix bug where it didn't recognize '@', '+', '.', etc.
adding a recorder function to collect output into an xml file; adding getvars and listvars command to MonkeyRunner
Add runtest test def for cts-webkit.
2009-10-08 10:43:28 -07:00
Jean-Baptiste Queru
fb24422423
merge from donut-gms
2009-10-08 10:00:39 -07:00
Raphael
e3ae0fe73a
Add SdkUiLib tests to adt-tests.
...
Also fixes the create_tests_symlink for Windows.
SDK BUG 2040986
Change-Id: I7d549c265efb9dbb5936ed7c9a7798eefee52d9b
2009-10-07 21:57:50 -07:00
Xavier Ducrohet
3a05612f59
Add hardware support to AVD creation dialog.
...
Change-Id: Ia20b55c788191b40159b5c38b66f1da333179ccc
2009-10-07 19:52:43 -07:00
Android (Google) Code Review
211195d193
Merge change I0d2bc2d1 into eclair
...
* changes:
New based dialog class.
2009-10-07 19:08:05 -04:00
Xavier Ducrohet
5e5e423346
New based dialog class.
...
This simply (for now) extends the jface dialog to properly
set it up.
Change-Id: I0d2bc2d10aad3811201f9d1df3efbfc87be50cb4
2009-10-07 16:04:23 -07:00
Romain Guy
9bda7101b8
Fix the MergeRootFrameLayout rule by checking the presence of padding.
...
Change-Id: I3a8b257025e74f6899233d9b99f7f86b5675e997
2009-10-07 12:31:17 -07:00
Android (Google) Code Review
7ce7a7835d
Merge change I47bf273a into eclair
...
* changes:
Update AVD creation UI to be easier for skin/sdcard.
2009-10-06 20:19:28 -04:00
Android (Google) Code Review
740e6ef010
Merge change Iafd22833 into eclair
...
* changes:
Add git ignore file for ninepatch eclipse project.
2009-10-06 20:19:02 -04:00