OSDN Git Service
Raphael [Tue, 13 Oct 2009 23:57:21 +0000 (16:57 -0700)]
am
d3fb418c: am
e7ad6a5e: Merge change I2fb42327 into eclair
Merge commit '
d3fb418c7c82c47c0b2c1d9b5383d4aca428252f'
* commit '
d3fb418c7c82c47c0b2c1d9b5383d4aca428252f':
SDK Manager: extra packages must respect min-tools-rev too.
Raphael [Tue, 13 Oct 2009 23:57:17 +0000 (16:57 -0700)]
am
7fd178a0: am
52eb73d2: Merge change I408e3eda into eclair
Merge commit '
7fd178a0e0345741cf18bc24ea5e68df2776f6b8'
* commit '
7fd178a0e0345741cf18bc24ea5e68df2776f6b8':
SDK Manager: fix selection of non-expanded remote archives.
Jack Palevich [Tue, 13 Oct 2009 23:57:13 +0000 (16:57 -0700)]
am
edb55982: Fix Terminal Preferences, Resolution
Merge commit '
edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0'
* commit '
edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0':
Fix Terminal Preferences, Resolution
Xavier Ducrohet [Tue, 13 Oct 2009 23:57:08 +0000 (16:57 -0700)]
Raphael [Tue, 13 Oct 2009 23:57:04 +0000 (16:57 -0700)]
am
da615ec6: am
31d0121f: Fix adt-tests: remove UpdaterLogicTest
Merge commit '
da615ec62d1897eee2c36aa20a6e5723bcd40d19'
* commit '
da615ec62d1897eee2c36aa20a6e5723bcd40d19':
Fix adt-tests: remove UpdaterLogicTest
Xavier Ducrohet [Tue, 13 Oct 2009 23:55:10 +0000 (16:55 -0700)]
am
d2560f89: am
4d59d18a: Merge change Ib18a32c1 into eclair
Merge commit '
d2560f89dda8adc3226d3aefb429d4b2c07e6bc3'
* commit '
d2560f89dda8adc3226d3aefb429d4b2c07e6bc3':
Minor label change (size -> resolution)
Brett Chabot [Tue, 13 Oct 2009 23:54:51 +0000 (16:54 -0700)]
am
2a910437: am
d00a9bcf: Merge change I3e6a5048 into eclair
Merge commit '
2a9104372f9f154b134f5c3386a4f95c8813b89f'
* commit '
2a9104372f9f154b134f5c3386a4f95c8813b89f':
Fix ADT tests failures:
Brett Chabot [Tue, 13 Oct 2009 23:52:21 +0000 (16:52 -0700)]
am
4226ff3e: am
8842cfe4: Merge change Ic77859c7 into eclair
Merge commit '
4226ff3e30571af63aaf1548305af35607198b5c'
* commit '
4226ff3e30571af63aaf1548305af35607198b5c':
Remove flaky ApiDemos tests from continuous.
Raphael [Tue, 13 Oct 2009 23:52:10 +0000 (16:52 -0700)]
am
d61dddbb: am
773e9af6: Merge change Ied6c54f1 into eclair
Merge commit '
d61dddbb18c619b6dfc3fd6d67c4baebc513c35f'
* commit '
d61dddbb18c619b6dfc3fd6d67c4baebc513c35f':
Fix continuous adt-test: UpdaterLogic is now public.
Brett Chabot [Tue, 13 Oct 2009 23:51:55 +0000 (16:51 -0700)]
am
0d4f7cd4: am
264d42dd: Merge change Idf5bcb58 into eclair
Merge commit '
0d4f7cd48a2544c6a964bdd86d829692bc25b681'
* commit '
0d4f7cd48a2544c6a964bdd86d829692bc25b681':
Fix ant install when -Dadb.device.arg not provided.
Raphael [Tue, 13 Oct 2009 23:51:15 +0000 (16:51 -0700)]
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
Android (Google) Code Review [Tue, 13 Oct 2009 19:15:12 +0000 (15:15 -0400)]
Merge change I2022dcd9
* changes:
Standardized on one single output buffer for all the commands output.
Jack Palevich [Tue, 13 Oct 2009 19:11:19 +0000 (12:11 -0700)]
am
494bb69b: Merge change I79297bbe into eclair-mr2
Merge commit '
494bb69bfd8990e5e02d40abc9a7a4d5eca76810'
* commit '
494bb69bfd8990e5e02d40abc9a7a4d5eca76810':
Turn of log message that was accidentally left on in an earlier commit.
Raphael [Tue, 13 Oct 2009 19:00:33 +0000 (12:00 -0700)]
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
Raphael [Tue, 13 Oct 2009 19:00:28 +0000 (12:00 -0700)]
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.
Xavier Ducrohet [Tue, 13 Oct 2009 19:00:24 +0000 (12:00 -0700)]
am
ab1b631b: am
f40ac8d6: Merge change Ic4387354 into eclair
Merge commit '
ab1b631b2cfb791d8c97ffce2197336661bd9142'
* commit '
ab1b631b2cfb791d8c97ffce2197336661bd9142':
Make WVGA/High skins use a higher VM heap size.
Raphael [Tue, 13 Oct 2009 19:00:20 +0000 (12:00 -0700)]
am
1d85d8d1: am
97a6420d: Merge change I935c71f2 into eclair
Merge commit '
1d85d8d1148e3c81500bb4aed66405fc6d33d956'
* commit '
1d85d8d1148e3c81500bb4aed66405fc6d33d956':
Add sholes to Windows USB Driver in Eclair.
Raphael [Tue, 13 Oct 2009 19:00:15 +0000 (12:00 -0700)]
am
9c8f3496: am
f3ae13d0: Merge change I7d549c26 into eclair
Merge commit '
9c8f3496f105d7ebb375a8dc2e39f554e3b16156'
* commit '
9c8f3496f105d7ebb375a8dc2e39f554e3b16156':
Add SdkUiLib tests to adt-tests.
Raphael [Tue, 13 Oct 2009 19:00:11 +0000 (12:00 -0700)]
am
3dcef76d: am
0947e82e: Merge change Ica46d149 into eclair
Merge commit '
3dcef76d30e6f2aae495c6236ed29f1b3f8ae421'
* commit '
3dcef76d30e6f2aae495c6236ed29f1b3f8ae421':
SDK Updater: platform dependency on tools, addon dependency on platform.
Xavier Ducrohet [Tue, 13 Oct 2009 19:00:07 +0000 (12:00 -0700)]
am
fb00ff8a: am
9cb6feee: Merge change Ia20b55c7 into eclair
Merge commit '
fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5'
* commit '
fb00ff8a6a5d2a7265f3ae3e6e4d5781aabb64b5':
Add hardware support to AVD creation dialog.
Jean-Baptiste Queru [Tue, 13 Oct 2009 19:00:03 +0000 (12:00 -0700)]
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.
Marco Nelissen [Tue, 13 Oct 2009 18:55:23 +0000 (11:55 -0700)]
am
7b7bdf13: am
32739c61: Merge change I2e026098 into eclair
Merge commit '
7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a'
* commit '
7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a':
Three implementations of a live wallpaper showing a spinning cube.
Android (Google) Code Review [Tue, 13 Oct 2009 16:53:58 +0000 (12:53 -0400)]
Merge change I800158fb
* changes:
Add new tabs for Compatibility and Get Source to source.android.com framework
Nicolas Catania [Tue, 13 Oct 2009 16:10:19 +0000 (09:10 -0700)]
Standardized on one single output buffer for all the commands output.
All the commands output go to an *Android Output* buffer which
gets cleaned up before each command run.
Fixed a compilation bug, building from the top Makefile was not
generating a new image.
Android (Google) Code Review [Mon, 12 Oct 2009 20:03:24 +0000 (16:03 -0400)]
Merge change I204a77b2
* changes:
New interactive functions to send commands to a device.
Xavier Ducrohet [Mon, 12 Oct 2009 19:38:10 +0000 (12:38 -0700)]
am
e3ec490a: am
211195d1: Merge change I0d2bc2d1 into eclair
Merge commit '
e3ec490a410978ee7bd5ce67b378974435e53a53'
* commit '
e3ec490a410978ee7bd5ce67b378974435e53a53':
New based dialog class.
Raphael [Mon, 12 Oct 2009 19:37:42 +0000 (12:37 -0700)]
am
86ff4a19: am
1121ceba: SDK: remove default.properties from ApiDemos
Merge commit '
86ff4a1905474bbcbef9b174013fe02740f78a0d'
* commit '
86ff4a1905474bbcbef9b174013fe02740f78a0d':
SDK: remove default.properties from ApiDemos
Robert Greenwalt [Mon, 12 Oct 2009 19:36:32 +0000 (12:36 -0700)]
am
d53aa9b9: Add Conn Man testing tools.
Merge commit '
d53aa9b917790c9f3480dd749b11707bd5c0f87a'
* commit '
d53aa9b917790c9f3480dd749b11707bd5c0f87a':
Add Conn Man testing tools.
Romain Guy [Mon, 12 Oct 2009 19:33:32 +0000 (12:33 -0700)]
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.
Xavier Ducrohet [Mon, 12 Oct 2009 19:33:27 +0000 (12:33 -0700)]
am
c8546767: am
7ce7a783: Merge change I47bf273a into eclair
Merge commit '
c85467672fe53721222828b458716f9f9303808d'
* commit '
c85467672fe53721222828b458716f9f9303808d':
Update AVD creation UI to be easier for skin/sdcard.
Xavier Ducrohet [Mon, 12 Oct 2009 19:33:22 +0000 (12:33 -0700)]
am
1a3566d5: am
740e6ef0: Merge change Iafd22833 into eclair
Merge commit '
1a3566d530930679e8e025d2f869d015ab1cfe86'
* commit '
1a3566d530930679e8e025d2f869d015ab1cfe86':
Add git ignore file for ninepatch eclipse project.
Raphael [Mon, 12 Oct 2009 19:33:16 +0000 (12:33 -0700)]
am
f4971e75: am
ca35b275: Merge change I15034878 into eclair
Merge commit '
f4971e75d235e918d4dd28f421a7c3b66ac84068'
* commit '
f4971e75d235e918d4dd28f421a7c3b66ac84068':
Fix Windows SDK build broken by layoutopt change.
Nicolas Catania [Sat, 10 Oct 2009 04:17:27 +0000 (21:17 -0700)]
New interactive functions to send commands to a device.
This is still a bit crude but now we can remount,sync,reboot and flash
a device from emacs.
Support product aliases.
Romain Guy [Mon, 12 Oct 2009 18:48:55 +0000 (11:48 -0700)]
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.
Xavier Ducrohet [Mon, 12 Oct 2009 18:46:21 +0000 (11:46 -0700)]
am
09c9ce61: am
b5c18403: Merge change Idc3d3b2f into eclair
Merge commit '
09c9ce619c4f51de2b4c4e42eecea33065dc0c97'
* commit '
09c9ce619c4f51de2b4c4e42eecea33065dc0c97':
Moved the test data to their own package.
Romain Guy [Mon, 12 Oct 2009 18:45:45 +0000 (11:45 -0700)]
am
0a4a1a54: am
2aaa22e0: Merge change Id7515f9a into eclair
Merge commit '
0a4a1a549bd8bb9cd7d5002aada9bd42396956d3'
* commit '
0a4a1a549bd8bb9cd7d5002aada9bd42396956d3':
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
Xavier Ducrohet [Mon, 12 Oct 2009 18:45:40 +0000 (11:45 -0700)]
am
be4c214e: am
8f242703: Merge change I56443773 into eclair
Merge commit '
be4c214e448191fff13eb749991d82409df4ba1e'
* commit '
be4c214e448191fff13eb749991d82409df4ba1e':
Add support for loading 9-patch from a stream.
Xavier Ducrohet [Mon, 12 Oct 2009 18:45:36 +0000 (11:45 -0700)]
am
80954af3: am
89482588: Merge change Iddb7f466 into eclair
Merge commit '
80954af3113209f033334762ad98d82f15635994'
* commit '
80954af3113209f033334762ad98d82f15635994':
Put kxml back in adt-test
Romain Guy [Mon, 12 Oct 2009 18:41:58 +0000 (11:41 -0700)]
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.
Romain Guy [Mon, 12 Oct 2009 18:40:41 +0000 (11:40 -0700)]
am
426a5b44: am
d9050e61: Merge change Idc9b152e into eclair
Merge commit '
426a5b44d8d7a7679feae836e98b7e94704fbcf8'
* commit '
426a5b44d8d7a7679feae836e98b7e94704fbcf8':
Add layoutopt to the SDK.
Xavier Ducrohet [Mon, 12 Oct 2009 18:37:30 +0000 (11:37 -0700)]
am
1651a351: am
67d9bcdf: Only create folder if not present.
Merge commit '
1651a351c0b7159c88dbc8145d1d24f06e340718'
* commit '
1651a351c0b7159c88dbc8145d1d24f06e340718':
Only create folder if not present.
Xavier Ducrohet [Mon, 12 Oct 2009 18:37:19 +0000 (11:37 -0700)]
am
fab088f4: am
8251e4ef: Merge change Iab62c8e9 into eclair
Merge commit '
fab088f454ee2f2ea07cc37e21dd6209e2b9b569'
* commit '
fab088f454ee2f2ea07cc37e21dd6209e2b9b569':
Add layoutlib.jar to the classpath of adt-tests
Xavier Ducrohet [Mon, 12 Oct 2009 18:37:12 +0000 (11:37 -0700)]
am
c3bcbabd: am
ee7c4739: Merge change Ic1eff784 into eclair
Merge commit '
c3bcbabdcf23176ac842253b60eaad02322198ad'
* commit '
c3bcbabdcf23176ac842253b60eaad02322198ad':
Fix script (and build)
Romain Guy [Mon, 12 Oct 2009 18:35:35 +0000 (11:35 -0700)]
am
104f9a74: am
b7e69d20: Merge change Ic8fe0b36 into eclair
Merge commit '
104f9a747d5ec5b7b4334ab9123dea6752a519f2'
* commit '
104f9a747d5ec5b7b4334ab9123dea6752a519f2':
Add 3 more rules to layoutopt/uix:
Dianne Hackborn [Mon, 12 Oct 2009 18:35:27 +0000 (11:35 -0700)]
Xavier Ducrohet [Mon, 12 Oct 2009 18:35:03 +0000 (11:35 -0700)]
am
62611904: am
24bf2fa3: Add tests from layoutlib to adt-tests
Merge commit '
6261190466f72703801652e7dcc69e093fba47f8'
* commit '
6261190466f72703801652e7dcc69e093fba47f8':
Add tests from layoutlib to adt-tests
Xavier Ducrohet [Mon, 12 Oct 2009 18:33:05 +0000 (11:33 -0700)]
am
9eb66652: am
b6e85c05: Merge change Ieb4e722b into eclair
Merge commit '
9eb66652e46d3424d42ee39897f5140a8305f609'
* commit '
9eb66652e46d3424d42ee39897f5140a8305f609':
Add sdklib tests to the adt-tests Unit tests.
Brett Chabot [Mon, 12 Oct 2009 18:33:00 +0000 (11:33 -0700)]
am
af86962d: am
6cc64cd2: Merge change I90b4c0e7 into eclair
Merge commit '
af86962d86160a9ab35f1bc9b4b373556ed0a099'
* commit '
af86962d86160a9ab35f1bc9b4b373556ed0a099':
Fix Eclipse sample tests.
Jack Palevich [Mon, 12 Oct 2009 18:32:55 +0000 (11:32 -0700)]
am
c2c1efc0: Merge change I27666897 into eclair-mr2
Merge commit '
c2c1efc02fcba6e68fd38282788c9cda204dde40'
* commit '
c2c1efc02fcba6e68fd38282788c9cda204dde40':
Make robot.png a raw resource.
Jack Palevich [Mon, 12 Oct 2009 18:31:35 +0000 (11:31 -0700)]
am
888dfd73: Merge change Ia7a9186b into eclair-mr2
Merge commit '
888dfd731b8d403c2003c38485d60b1fd1dd5e76'
* commit '
888dfd731b8d403c2003c38485d60b1fd1dd5e76':
Remove non-working high-res robot texture.
Xavier Ducrohet [Mon, 12 Oct 2009 18:30:14 +0000 (11:30 -0700)]
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.
Romain Guy [Mon, 12 Oct 2009 18:30:09 +0000 (11:30 -0700)]
am
8fbe805f: am
06d3ec15: Only process XML files in layoutopt.
Merge commit '
8fbe805f161c71e4dc471b2104484f221674de28'
* commit '
8fbe805f161c71e4dc471b2104484f221674de28':
Only process XML files in layoutopt.
Romain Guy [Mon, 12 Oct 2009 18:30:04 +0000 (11:30 -0700)]
am
1db3cfa4: am
d01b8dd3: Merge change I5dfb2567 into eclair
Merge commit '
1db3cfa4f846ee01c55e3ac5e1ea0807bcde6345'
* commit '
1db3cfa4f846ee01c55e3ac5e1ea0807bcde6345':
Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.
Derek Sollenberger [Mon, 12 Oct 2009 18:29:53 +0000 (11:29 -0700)]
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.
Fred Quintana [Mon, 12 Oct 2009 18:29:40 +0000 (11:29 -0700)]
am
db8fdbec: account manager api review changes
Merge commit '
db8fdbec4268697653d5688d0a0092483b3832f1'
* commit '
db8fdbec4268697653d5688d0a0092483b3832f1':
account manager api review changes
Romain Guy [Mon, 12 Oct 2009 18:25:58 +0000 (11:25 -0700)]
am
06f70393: Merge change I8e4697e1 into eclair
Merge commit '
06f70393bd6c10c24136492a4616019822c63299'
* commit '
06f70393bd6c10c24136492a4616019822c63299':
New layout optimization tool. Run layoutopt on the command line.
Raphael [Mon, 12 Oct 2009 18:23:44 +0000 (11:23 -0700)]
am
1061c0c7: Merge change I69afafa4 into eclair
Merge commit '
1061c0c7dc20479626aa8b2d71485c9e17e7daf7'
* commit '
1061c0c7dc20479626aa8b2d71485c9e17e7daf7':
ADT: Create project from existing sample in New Project Wizard
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:39 +0000 (11:23 -0700)]
am
90ee703e: Fix resource resolution in the graphical layout editor.
Merge commit '
90ee703e945cedaa222e8e5a2aba6333afff21b6'
* commit '
90ee703e945cedaa222e8e5a2aba6333afff21b6':
Fix resource resolution in the graphical layout editor.
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:34 +0000 (11:23 -0700)]
am
d280d236: Monintor resolution/size chooser dialog
Merge commit '
d280d2363e412c43b1a7bfe044044d70d8895154'
* commit '
d280d2363e412c43b1a7bfe044044d70d8895154':
Monintor resolution/size chooser dialog
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:30 +0000 (11:23 -0700)]
am
d13d440d: Emulator launch options dialog.
Merge commit '
d13d440d43a744ab6e596e52cf53eef79d222d01'
* commit '
d13d440d43a744ab6e596e52cf53eef79d222d01':
Emulator launch options dialog.
Raphael [Mon, 12 Oct 2009 18:23:25 +0000 (11:23 -0700)]
am
ef133787: SDK: Fix CustomLocale to properly setup Language+Country
Merge commit '
ef1337876b2dfbf76dc7e45e035f4a25ebc0f560'
* commit '
ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
SDK: Fix CustomLocale to properly setup Language+Country
Jeff Sharkey [Mon, 12 Oct 2009 18:23:15 +0000 (11:23 -0700)]
am
480332f6: Revise template to match spec per jham.
Merge commit '
480332f6c5ee0da552426716abff5ddd87074a5f'
* commit '
480332f6c5ee0da552426716abff5ddd87074a5f':
Revise template to match spec per jham.
David 'Digit' Turner [Mon, 12 Oct 2009 18:23:11 +0000 (11:23 -0700)]
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
David 'Digit' Turner [Mon, 12 Oct 2009 18:23:06 +0000 (11:23 -0700)]
am
79adc9fc: Merge change Ia78a7753 into eclair
Merge commit '
79adc9fc9040760a722f2cc5fd15a517f4cbb245'
* commit '
79adc9fc9040760a722f2cc5fd15a517f4cbb245':
Remove bash-specific operator from build/host-setup.sh.
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:01 +0000 (11:23 -0700)]
am
f0737030: Fix Android Manifest parser.
Merge commit '
f0737030570be15c1789d00db3593eb78cee9fbc'
* commit '
f0737030570be15c1789d00db3593eb78cee9fbc':
Fix Android Manifest parser.
Raphael [Mon, 12 Oct 2009 18:22:56 +0000 (11:22 -0700)]
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.
Raphael [Mon, 12 Oct 2009 18:22:52 +0000 (11:22 -0700)]
am
657bdd7d: Merge change I8a575e49 into eclair
Merge commit '
657bdd7d2851cd3b09f156c4abd085614efdc593'
* commit '
657bdd7d2851cd3b09f156c4abd085614efdc593':
Fix CustomLocale to work with soft keyboard.
Xavier Ducrohet [Mon, 12 Oct 2009 18:22:47 +0000 (11:22 -0700)]
Raphael [Mon, 12 Oct 2009 18:22:42 +0000 (11:22 -0700)]
am
1233e408: Merge change Ie3124796 into eclair
Merge commit '
1233e408f77ad8752afa1387a94c8e2b378b6629'
* commit '
1233e408f77ad8752afa1387a94c8e2b378b6629':
Ignore adt/eclipse project files in CustomLocale
Xavier Ducrohet [Mon, 12 Oct 2009 18:22:37 +0000 (11:22 -0700)]
am
227b8768: Load default GLE device profiles from the SDK.
Merge commit '
227b8768fa8accff8a9e3555351af05d41ad7840'
* commit '
227b8768fa8accff8a9e3555351af05d41ad7840':
Load default GLE device profiles from the SDK.
Raphael [Sun, 11 Oct 2009 17:03:57 +0000 (10:03 -0700)]
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.
Raphael [Sun, 11 Oct 2009 17:03:53 +0000 (10:03 -0700)]
am
52eb73d2: Merge change I408e3eda into eclair
Merge commit '
52eb73d25ca3ffc2467bca1443752c13bc1bc900' into eclair-mr2
* commit '
52eb73d25ca3ffc2467bca1443752c13bc1bc900':
SDK Manager: fix selection of non-expanded remote archives.
Android (Google) Code Review [Sun, 11 Oct 2009 16:52:46 +0000 (12:52 -0400)]
Merge change I2fb42327 into eclair
* changes:
SDK Manager: extra packages must respect min-tools-rev too.
Android (Google) Code Review [Sun, 11 Oct 2009 16:51:53 +0000 (12:51 -0400)]
Merge change I408e3eda into eclair
* changes:
SDK Manager: fix selection of non-expanded remote archives.
Jack Palevich [Sat, 10 Oct 2009 03:16:26 +0000 (20:16 -0700)]
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
Raphael [Sat, 10 Oct 2009 01:45:15 +0000 (18:45 -0700)]
SDK Manager: extra packages must respect min-tools-rev too.
SDK BUG
2040986
Change-Id: I2fb42327ff6d474fd8ad58fcd0725af3972ea026
Raphael [Sat, 10 Oct 2009 00:34:30 +0000 (17:34 -0700)]
SDK Manager: fix selection of non-expanded remote archives.
SDK BUG
2177033
Change-Id: I408e3edaa5a418df871ebf0da567468bf81189df
Xavier Ducrohet [Fri, 9 Oct 2009 23:27:00 +0000 (16:27 -0700)]
am
126a1950: Add missing override.
Merge commit '
126a19500c2d7d834d592a79e38ea6a0b678c94c' into eclair-mr2
* commit '
126a19500c2d7d834d592a79e38ea6a0b678c94c':
Add missing override.
Raphael [Fri, 9 Oct 2009 23:26:56 +0000 (16:26 -0700)]
am
31d0121f: Fix adt-tests: remove UpdaterLogicTest
Merge commit '
31d0121f684fbd5eba4c9ad612b850732b659f40' into eclair-mr2
* commit '
31d0121f684fbd5eba4c9ad612b850732b659f40':
Fix adt-tests: remove UpdaterLogicTest
Xavier Ducrohet [Fri, 9 Oct 2009 22:36:52 +0000 (15:36 -0700)]
Add missing override.
Change-Id: Id9608b8ac9f05c3e0db92668797b2d80f0690397
Raphael [Fri, 9 Oct 2009 21:20:04 +0000 (14:20 -0700)]
Fix adt-tests: remove UpdaterLogicTest
Also reverts UpdaterLogic as package-private and
adds some javadoc to it.
SDK BUG
2179267
Change-Id: I19644cc4c99ac70598f3cbcfface2f19d9999931
Xavier Ducrohet [Fri, 9 Oct 2009 21:29:27 +0000 (14:29 -0700)]
am
4d59d18a: Merge change Ib18a32c1 into eclair
Merge commit '
4d59d18abaf5546ab1c2cccd11655073df937c18' into eclair-mr2
* commit '
4d59d18abaf5546ab1c2cccd11655073df937c18':
Minor label change (size -> resolution)
Android (Google) Code Review [Fri, 9 Oct 2009 21:20:52 +0000 (17:20 -0400)]
Merge change Ib18a32c1 into eclair
* changes:
Minor label change (size -> resolution)
Brett Chabot [Fri, 9 Oct 2009 20:58:25 +0000 (13:58 -0700)]
am
d00a9bcf: Merge change I3e6a5048 into eclair
Merge commit '
d00a9bcffed8fa7cdd4bac8b58c6abe7d6e93adf' into eclair-mr2
* commit '
d00a9bcffed8fa7cdd4bac8b58c6abe7d6e93adf':
Fix ADT tests failures:
Android (Google) Code Review [Fri, 9 Oct 2009 20:45:44 +0000 (16:45 -0400)]
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.
Xavier Ducrohet [Fri, 9 Oct 2009 20:41:56 +0000 (13:41 -0700)]
Minor label change (size -> resolution)
Also remove unused imports
Change-Id: Ib18a32c126bc913e3e0c14546d2ce693190be1d1
Brett Chabot [Wed, 7 Oct 2009 21:00:24 +0000 (14:00 -0700)]
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
Brett Chabot [Fri, 9 Oct 2009 19:32:46 +0000 (12:32 -0700)]
am
8842cfe4: Merge change Ic77859c7 into eclair
Merge commit '
8842cfe4a1f190906c99896992d1bbb7b144fb90' into eclair-mr2
* commit '
8842cfe4a1f190906c99896992d1bbb7b144fb90':
Remove flaky ApiDemos tests from continuous.
Android (Google) Code Review [Fri, 9 Oct 2009 19:22:43 +0000 (15:22 -0400)]
Merge change Ic77859c7 into eclair
* changes:
Remove flaky ApiDemos tests from continuous.
Raphael [Fri, 9 Oct 2009 19:22:09 +0000 (12:22 -0700)]
am
773e9af6: Merge change Ied6c54f1 into eclair
Merge commit '
773e9af64537ed16e7353ef13bc309f477c98abd' into eclair-mr2
* commit '
773e9af64537ed16e7353ef13bc309f477c98abd':
Fix continuous adt-test: UpdaterLogic is now public.
Brett Chabot [Thu, 8 Oct 2009 22:33:33 +0000 (15:33 -0700)]
Remove flaky ApiDemos tests from continuous.
These aren't needed anyway, since they are run as part of SDK test set.
BUG
2081356
Android (Google) Code Review [Fri, 9 Oct 2009 19:15:45 +0000 (15:15 -0400)]
Merge change Ied6c54f1 into eclair
* changes:
Fix continuous adt-test: UpdaterLogic is now public.
Brett Chabot [Fri, 9 Oct 2009 18:52:02 +0000 (11:52 -0700)]
am
264d42dd: Merge change Idf5bcb58 into eclair
Merge commit '
264d42dd1cfb5ce9fc9c29e192623af2c20b2900' into eclair-mr2
* commit '
264d42dd1cfb5ce9fc9c29e192623af2c20b2900':
Fix ant install when -Dadb.device.arg not provided.
Raphael [Fri, 9 Oct 2009 18:48:04 +0000 (11:48 -0700)]
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
Android (Google) Code Review [Fri, 9 Oct 2009 18:45:22 +0000 (14:45 -0400)]
Merge change Idf5bcb58 into eclair
* changes:
Fix ant install when -Dadb.device.arg not provided.
Brett Chabot [Fri, 9 Oct 2009 04:19:36 +0000 (21:19 -0700)]
Fix ant install when -Dadb.device.arg not provided.
And also add the adb.device.arg support to ant uninstall.
BUG
2172690
Raphael [Fri, 9 Oct 2009 17:59:22 +0000 (10:59 -0700)]
am
b2fa9b71: Merge change I2c7af74e into eclair
Merge commit '
b2fa9b713d82e2111eeee83d134802b3ae67a142' into eclair-mr2
* commit '
b2fa9b713d82e2111eeee83d134802b3ae67a142':
SDK Updater: don't auto-expand archives when selecting a package
Android (Google) Code Review [Fri, 9 Oct 2009 17:52:36 +0000 (13:52 -0400)]
Merge change I2c7af74e into eclair
* changes:
SDK Updater: don't auto-expand archives when selecting a package
Nicolas Catania [Fri, 9 Oct 2009 16:24:42 +0000 (09:24 -0700)]
Minor cleanup, fix documentation.
Refactored the tests for the makefile existence in a
separate function.
Ran checkdoc and fixed errors.
Gaurav Mathur [Fri, 9 Oct 2009 06:50:24 +0000 (23:50 -0700)]
Add new tabs for Compatibility and Get Source to source.android.com framework