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
Dianne Hackborn
b4bb414ceb
am 6677ac27: am d2fc4352: Merge change I6b618094 into eclair
...
Merge commit '6677ac27773768e006f69abd03aeafc92d66661a'
* commit '6677ac27773768e006f69abd03aeafc92d66661a':
Fix build.
2009-10-12 11:35:27 -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
Jack Palevich
68e943ef9a
am c2c1efc0: Merge change I27666897 into eclair-mr2
...
Merge commit 'c2c1efc02fcba6e68fd38282788c9cda204dde40'
* commit 'c2c1efc02fcba6e68fd38282788c9cda204dde40':
Make robot.png a raw resource.
2009-10-12 11:32:55 -07:00
Jack Palevich
bd3e51e101
am 888dfd73: Merge change Ia7a9186b into eclair-mr2
...
Merge commit '888dfd731b8d403c2003c38485d60b1fd1dd5e76'
* commit '888dfd731b8d403c2003c38485d60b1fd1dd5e76':
Remove non-working high-res robot texture.
2009-10-12 11:31:35 -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
Derek Sollenberger
62618ffbfa
am 4c46bf95: Merge change I108ad940 into eclair-mr2
...
Merge commit '4c46bf9558d928568905eeeda26657b80cbc399d'
* commit '4c46bf9558d928568905eeeda26657b80cbc399d':
Adding a full screen video sample plugin. Also cleaned up surface plugins to use the provided JavaVM.
2009-10-12 11:29:53 -07:00
Fred Quintana
3640a33afa
am db8fdbec: account manager api review changes
...
Merge commit 'db8fdbec4268697653d5688d0a0092483b3832f1'
* commit 'db8fdbec4268697653d5688d0a0092483b3832f1':
account manager api review changes
2009-10-12 11:29:40 -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
Raphael
15fdd346a2
am ef133787: SDK: Fix CustomLocale to properly setup Language+Country
...
Merge commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560'
* commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
SDK: Fix CustomLocale to properly setup Language+Country
2009-10-12 11:23:25 -07:00
Jeff Sharkey
65ab5053c9
am 480332f6: Revise template to match spec per jham.
...
Merge commit '480332f6c5ee0da552426716abff5ddd87074a5f'
* commit '480332f6c5ee0da552426716abff5ddd87074a5f':
Revise template to match spec per jham.
2009-10-12 11:23:15 -07:00
David 'Digit' Turner
ce3ff41ba0
am cc230ba0: Ensure the version of \'awk\' detected by host-setup.sh is used during the build
...
Merge commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee'
* commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee':
Ensure the version of 'awk' detected by host-setup.sh is used during the build
2009-10-12 11:23:11 -07:00
David 'Digit' Turner
3264e24b22
am 79adc9fc: Merge change Ia78a7753 into eclair
...
Merge commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245'
* commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245':
Remove bash-specific operator from build/host-setup.sh.
2009-10-12 11:23:06 -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
Raphael
4e53735ede
am 657bdd7d: Merge change I8a575e49 into eclair
...
Merge commit '657bdd7d2851cd3b09f156c4abd085614efdc593'
* commit '657bdd7d2851cd3b09f156c4abd085614efdc593':
Fix CustomLocale to work with soft keyboard.
2009-10-12 11:22:52 -07:00
Xavier Ducrohet
cd53b3bc5a
am 2cdd16b7: fix the build
...
Merge commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652'
* commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652':
fix the build
2009-10-12 11:22:47 -07:00
Raphael
9729e97806
am 1233e408: Merge change Ie3124796 into eclair
...
Merge commit '1233e408f77ad8752afa1387a94c8e2b378b6629'
* commit '1233e408f77ad8752afa1387a94c8e2b378b6629':
Ignore adt/eclipse project files in CustomLocale
2009-10-12 11:22:42 -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
7dcaccf359
am e4c98c01: SDK Manager: display packages revisions
...
Merge commit 'e4c98c0191242cd29712ab54fbe49e8a75f8db0b' into eclair-mr2
* commit 'e4c98c0191242cd29712ab54fbe49e8a75f8db0b':
SDK Manager: display packages revisions
2009-10-11 10:29:30 -07:00
Raphael
29781e895d
am e4c98c01: SDK Manager: display packages revisions
...
Merge commit 'e4c98c0191242cd29712ab54fbe49e8a75f8db0b' into eclair-plus-aosp
* commit 'e4c98c0191242cd29712ab54fbe49e8a75f8db0b':
SDK Manager: display packages revisions
2009-10-11 10:29:12 -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
Raphael
d3fb418c7c
am e7ad6a5e: Merge change I2fb42327 into eclair
...
Merge commit 'e7ad6a5e40ff032df21e934f1f61c2730de9a16b' into eclair-mr2
* commit 'e7ad6a5e40ff032df21e934f1f61c2730de9a16b':
SDK Manager: extra packages must respect min-tools-rev too.
2009-10-11 10:03:57 -07:00
Raphael
7fd178a0e0
am 52eb73d2: Merge change I408e3eda into eclair
...
Merge commit '52eb73d25ca3ffc2467bca1443752c13bc1bc900' into eclair-mr2
* commit '52eb73d25ca3ffc2467bca1443752c13bc1bc900':
SDK Manager: fix selection of non-expanded remote archives.
2009-10-11 10:03:53 -07:00
Raphael
8a378c117f
am e7ad6a5e: Merge change I2fb42327 into eclair
...
Merge commit 'e7ad6a5e40ff032df21e934f1f61c2730de9a16b' into eclair-plus-aosp
* commit 'e7ad6a5e40ff032df21e934f1f61c2730de9a16b':
SDK Manager: extra packages must respect min-tools-rev too.
2009-10-11 10:02:40 -07:00
Raphael
4c03bfe0d9
am 52eb73d2: Merge change I408e3eda into eclair
...
Merge commit '52eb73d25ca3ffc2467bca1443752c13bc1bc900' into eclair-plus-aosp
* commit '52eb73d25ca3ffc2467bca1443752c13bc1bc900':
SDK Manager: fix selection of non-expanded remote archives.
2009-10-11 10:02:34 -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
Jack Palevich
edb55982e1
Fix Terminal Preferences, Resolution
...
The terminal app was using the preferences framework incorrectly: it was
trying to keep its own authoritative copies of the preferences, instead
of relying in the preference framework to store the preferences. This
lead to some race conditions, and made terminal's preferences not work
correctly in Donut or Eclair.
Terminal now uses preferences in a more straightforward way.
As long as I was editing terminal, I made two additional changes:
Term now honors the display density. This makes the text more readable on
high-density devices.
An I put in some error checks for empty shell and first-command strings.
Fixes bug 2177356 Term program on Sholes: preferences doesn't work
2009-10-09 20:16:26 -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
5e04446cb1
am 126a1950: Add missing override.
...
Merge commit '126a19500c2d7d834d592a79e38ea6a0b678c94c' into eclair-mr2
* commit '126a19500c2d7d834d592a79e38ea6a0b678c94c':
Add missing override.
2009-10-09 16:27:00 -07:00
Raphael
da615ec62d
am 31d0121f: Fix adt-tests: remove UpdaterLogicTest
...
Merge commit '31d0121f684fbd5eba4c9ad612b850732b659f40' into eclair-mr2
* commit '31d0121f684fbd5eba4c9ad612b850732b659f40':
Fix adt-tests: remove UpdaterLogicTest
2009-10-09 16:26:56 -07:00
Xavier Ducrohet
9788502d91
am 126a1950: Add missing override.
...
Merge commit '126a19500c2d7d834d592a79e38ea6a0b678c94c' into eclair-plus-aosp
* commit '126a19500c2d7d834d592a79e38ea6a0b678c94c':
Add missing override.
2009-10-09 16:02:06 -07:00
Raphael
aff51536b1
am 31d0121f: Fix adt-tests: remove UpdaterLogicTest
...
Merge commit '31d0121f684fbd5eba4c9ad612b850732b659f40' into eclair-plus-aosp
* commit '31d0121f684fbd5eba4c9ad612b850732b659f40':
Fix adt-tests: remove UpdaterLogicTest
2009-10-09 16:02:02 -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
Xavier Ducrohet
d2560f89dd
am 4d59d18a: Merge change Ib18a32c1 into eclair
...
Merge commit '4d59d18abaf5546ab1c2cccd11655073df937c18' into eclair-mr2
* commit '4d59d18abaf5546ab1c2cccd11655073df937c18':
Minor label change (size -> resolution)
2009-10-09 14:29:27 -07:00
Xavier Ducrohet
f96afe2b28
am 4d59d18a: Merge change Ib18a32c1 into eclair
...
Merge commit '4d59d18abaf5546ab1c2cccd11655073df937c18' into eclair-plus-aosp
* commit '4d59d18abaf5546ab1c2cccd11655073df937c18':
Minor label change (size -> resolution)
2009-10-09 14:28:40 -07:00