Commit Graph

1162 Commits

Author SHA1 Message Date
Raphael
a55fb39176 am 7fd178a0: am 52eb73d2: Merge change I408e3eda into eclair
Merge commit '7fd178a0e0345741cf18bc24ea5e68df2776f6b8'

* commit '7fd178a0e0345741cf18bc24ea5e68df2776f6b8':
  SDK Manager: fix selection of non-expanded remote archives.
2009-10-13 16:57:17 -07:00
Xavier Ducrohet
0de953622f am 5e04446c: am 126a1950: Add missing override.
Merge commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40'

* commit '5e04446cb1ce2cd83e85fbf41af8581a73cdfc40':
  Add missing override.
2009-10-13 16:57:08 -07:00
Raphael
85427348f5 am da615ec6: am 31d0121f: Fix adt-tests: remove UpdaterLogicTest
Merge commit 'da615ec62d1897eee2c36aa20a6e5723bcd40d19'

* commit 'da615ec62d1897eee2c36aa20a6e5723bcd40d19':
  Fix adt-tests: remove UpdaterLogicTest
2009-10-13 16:57:04 -07:00
Xavier Ducrohet
1f8dfe220e am d2560f89: am 4d59d18a: Merge change Ib18a32c1 into eclair
Merge commit 'd2560f89dda8adc3226d3aefb429d4b2c07e6bc3'

* commit 'd2560f89dda8adc3226d3aefb429d4b2c07e6bc3':
  Minor label change (size -> resolution)
2009-10-13 16:55:10 -07:00
Brett Chabot
9a3d2ef78d am 2a910437: am d00a9bcf: Merge change I3e6a5048 into eclair
Merge commit '2a9104372f9f154b134f5c3386a4f95c8813b89f'

* commit '2a9104372f9f154b134f5c3386a4f95c8813b89f':
  Fix ADT tests failures:
2009-10-13 16:54:51 -07:00
Raphael
ae8ee4314e am d61dddbb: am 773e9af6: Merge change Ied6c54f1 into eclair
Merge commit 'd61dddbb18c619b6dfc3fd6d67c4baebc513c35f'

* commit 'd61dddbb18c619b6dfc3fd6d67c4baebc513c35f':
  Fix continuous adt-test: UpdaterLogic is now public.
2009-10-13 16:52:10 -07:00
Brett Chabot
bcff9211d6 am 0d4f7cd4: am 264d42dd: Merge change Idf5bcb58 into eclair
Merge commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681'

* commit '0d4f7cd48a2544c6a964bdd86d829692bc25b681':
  Fix ant install when -Dadb.device.arg not provided.
2009-10-13 16:51:55 -07:00
Raphael
7a0cd1629b am 0c384c58: am b2fa9b71: Merge change I2c7af74e into eclair
Merge commit '0c384c581432c64121b53082bc6b348c342dd6f1'

* commit '0c384c581432c64121b53082bc6b348c342dd6f1':
  SDK Updater: don't auto-expand archives when selecting a package
2009-10-13 16:51:15 -07:00
Raphael
d9d862c594 am b80add6c: am 3334a587: Fix "android create project" to properly set name in strings.xml
Merge commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4'

* commit 'b80add6c6d9b587f4c13764cf232627fa306a2d4':
  Fix "android create project" to properly set name in strings.xml
2009-10-13 12:00:33 -07:00
Raphael
cdbd3990e3 am cfd96c9a: am 8eff7f57: Support adb device-targeting arguments in ant scripts.
Merge commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1'

* commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1':
  Support adb device-targeting arguments in ant scripts.
2009-10-13 12:00:28 -07:00
Raphael
f4345a3451 am 9c8f3496: am f3ae13d0: Merge change I7d549c26 into eclair
Merge commit '9c8f3496f105d7ebb375a8dc2e39f554e3b16156'

* commit '9c8f3496f105d7ebb375a8dc2e39f554e3b16156':
  Add SdkUiLib tests to adt-tests.
2009-10-13 12:00:15 -07:00
Raphael
3f34821b63 am 3dcef76d: am 0947e82e: Merge change Ica46d149 into eclair
Merge commit '3dcef76d30e6f2aae495c6236ed29f1b3f8ae421'

* commit '3dcef76d30e6f2aae495c6236ed29f1b3f8ae421':
  SDK Updater: platform dependency on tools, addon dependency on platform.
2009-10-13 12:00:11 -07:00
Xavier Ducrohet
79b4670374 am fb00ff8a: am 9cb6feee: Merge change Ia20b55c7 into eclair
Merge commit 'fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5'

* commit 'fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5':
  Add hardware support to AVD creation dialog.
2009-10-13 12:00:07 -07:00
Jean-Baptiste Queru
d9c661623c am d410b728: am b7c548eb: am fb244224: merge from donut-gms
Merge commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d'

* commit 'd410b728d55f0e26169d54d49bb91b61a6dd033d':
  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-13 12:00:03 -07:00
Xavier Ducrohet
62698e3511 am e3ec490a: am 211195d1: Merge change I0d2bc2d1 into eclair
Merge commit 'e3ec490a410978ee7bd5ce67b378974435e53a53'

* commit 'e3ec490a410978ee7bd5ce67b378974435e53a53':
  New based dialog class.
2009-10-12 12:38:10 -07:00
Romain Guy
0b9c3dfb38 am ca69cda6: am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.
Merge commit 'ca69cda6f8c4c098dbd178929322d53646215339'

* commit 'ca69cda6f8c4c098dbd178929322d53646215339':
  Fix the MergeRootFrameLayout rule by checking the presence of padding.
2009-10-12 12:33:32 -07:00
Xavier Ducrohet
4fe754022a am c8546767: am 7ce7a783: Merge change I47bf273a into eclair
Merge commit 'c85467672fe53721222828b458716f9f9303808d'

* commit 'c85467672fe53721222828b458716f9f9303808d':
  Update AVD creation UI to be easier for skin/sdcard.
2009-10-12 12:33:27 -07:00
Xavier Ducrohet
140bb97828 am 1a3566d5: am 740e6ef0: Merge change Iafd22833 into eclair
Merge commit '1a3566d530930679e8e025d2f869d015ab1cfe86'

* commit '1a3566d530930679e8e025d2f869d015ab1cfe86':
  Add git ignore file for ninepatch eclipse project.
2009-10-12 12:33:22 -07:00
Romain Guy
0f00352243 am ad1af627: am ece784c5: Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
Merge commit 'ad1af627ea393b2ba295daa58bccceab69a0452d'

* commit 'ad1af627ea393b2ba295daa58bccceab69a0452d':
  Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
2009-10-12 11:48:55 -07:00
Xavier Ducrohet
7d13d4319f am 09c9ce61: am b5c18403: Merge change Idc3d3b2f into eclair
Merge commit '09c9ce619c4f51de2b4c4e42eecea33065dc0c97'

* commit '09c9ce619c4f51de2b4c4e42eecea33065dc0c97':
  Moved the test data to their own package.
2009-10-12 11:46:21 -07:00
Romain Guy
5cd8a0b57d am 0a4a1a54: am 2aaa22e0: Merge change Id7515f9a into eclair
Merge commit '0a4a1a549bd8bb9cd7d5002aada9bd42396956d3'

* commit '0a4a1a549bd8bb9cd7d5002aada9bd42396956d3':
  New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
2009-10-12 11:45:45 -07:00
Xavier Ducrohet
585f26db2d am be4c214e: am 8f242703: Merge change I56443773 into eclair
Merge commit 'be4c214e448191fff13eb749991d82409df4ba1e'

* commit 'be4c214e448191fff13eb749991d82409df4ba1e':
  Add support for loading 9-patch from a stream.
2009-10-12 11:45:40 -07:00
Xavier Ducrohet
a57e3ddde3 am 80954af3: am 89482588: Merge change Iddb7f466 into eclair
Merge commit '80954af3113209f033334762ad98d82f15635994'

* commit '80954af3113209f033334762ad98d82f15635994':
  Put kxml back in adt-test
2009-10-12 11:45:36 -07:00
Romain Guy
a6a360f2dd am 8e2c6026: am 16a56b8c: Fix NPE in layoutopt when trying to open non-XML files.
Merge commit '8e2c602625c12e93ef9e4891e90d1737c90c0eba'

* commit '8e2c602625c12e93ef9e4891e90d1737c90c0eba':
  Fix NPE in layoutopt when trying to open non-XML files.
2009-10-12 11:41:58 -07:00
Xavier Ducrohet
030b98cf62 am 1651a351: am 67d9bcdf: Only create folder if not present.
Merge commit '1651a351c0b7159c88dbc8145d1d24f06e340718'

* commit '1651a351c0b7159c88dbc8145d1d24f06e340718':
  Only create folder if not present.
2009-10-12 11:37:30 -07:00
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
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
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