Commit Graph

3376 Commits

Author SHA1 Message Date
Jack Palevich
2ad8db7a6d am edb55982: Fix Terminal Preferences, Resolution
Merge commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0'

* commit 'edb55982e1c86b99718bb7ccfd4e1d4cd33d5bd0':
  Fix Terminal Preferences, Resolution
2009-10-13 16:57:13 -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
Brett Chabot
35f7549076 am 4226ff3e: am 8842cfe4: Merge change Ic77859c7 into eclair
Merge commit '4226ff3e30571af63aaf1548305af35607198b5c'

* commit '4226ff3e30571af63aaf1548305af35607198b5c':
  Remove flaky ApiDemos tests from continuous.
2009-10-13 16:52:21 -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
Eric Fischer
10a26063d2 Reimport translations.
Change-Id: I94f75699909161b4357b1678849e6a45fabe9e7c
2009-10-13 16:28:31 -07:00
Android (Google) Code Review
5836ee0b9e Merge change I2022dcd9
* changes:
  Standardized on one single output buffer for all the commands output.
2009-10-13 15:15:12 -04:00
Jack Palevich
3328b18293 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.
2009-10-13 12:11:19 -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
Xavier Ducrohet
af29bd0741 am ab1b631b: am f40ac8d6: Merge change Ic4387354 into eclair
Merge commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142'

* commit 'ab1b631b2cfb791d8c97ffce2197336661bd9142':
  Make WVGA/High skins use a higher VM heap size.
2009-10-13 12:00:24 -07:00
Raphael
3c7c84dcff am 1d85d8d1: am 97a6420d: Merge change I935c71f2 into eclair
Merge commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956'

* commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956':
  Add sholes to Windows USB Driver in Eclair.
2009-10-13 12:00:20 -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
Marco Nelissen
0d0d319f21 am 7b7bdf13: am 32739c61: Merge change I2e026098 into eclair
Merge commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a'

* commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a':
  Three implementations of a live wallpaper showing a spinning cube.
2009-10-13 11:55:23 -07:00
Android (Google) Code Review
bc7c36728c Merge change I6dbcafab into eclair
* changes:
  Fix NPE in the parsing of property file.
2009-10-13 14:41:47 -04:00
Android (Google) Code Review
60e45099aa Merge change Ibb660dd5 into eclair-mr2
* changes:
  updating sample plugins to support fixed surface dimensions.
2009-10-13 14:39:26 -04:00
Xavier Ducrohet
73ecae2fdc Fix NPE in the parsing of property file.
this could happen if the log object is null and the parsing fails.

Change-Id: I6dbcafab26c5405efba20b30f511104fcee5bf78
2009-10-13 10:28:16 -07:00
Android (Google) Code Review
f45515ee46 Merge change I800158fb
* changes:
  Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-13 12:53:58 -04:00
Raphael
f4fe738d0f am 96fc3df6: Merge change Ib096f1f0 into eclair
Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-mr2

* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
  SDK Manager: suggest install of new platforms, addons or extra packages.
2009-10-13 09:45:25 -07:00
Nicolas Catania
2022dcd9f1 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.
2009-10-13 09:10:19 -07:00
Derek Sollenberger
bb660dd555 updating sample plugins to support fixed surface dimensions. 2009-10-13 11:45:47 -04:00
Raphael
173e5f056c am 96fc3df6: Merge change Ib096f1f0 into eclair
Merge commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c' into eclair-plus-aosp

* commit '96fc3df6932a85b21a5ca7f3dbd42381ddf3147c':
  SDK Manager: suggest install of new platforms, addons or extra packages.
2009-10-12 21:46:50 -07:00
Android (Google) Code Review
96fc3df693 Merge change Ib096f1f0 into eclair
* changes:
  SDK Manager: suggest install of new platforms, addons or extra packages.
2009-10-13 00:38:11 -04:00
Raphael
46ab498e50 am 9bdf821f: SDK: Support "android.bat update sdk"
Merge commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268' into eclair-mr2

* commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268':
  SDK: Support "android.bat update sdk"
2009-10-12 15:46:52 -07:00
Raphael
d804cfe8b9 am 9bdf821f: SDK: Support "android.bat update sdk"
Merge commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268' into eclair-plus-aosp

* commit '9bdf821fc1fe8cfa8fa88f268c53c4848c8b6268':
  SDK: Support "android.bat update sdk"
2009-10-12 15:37:42 -07:00
Raphael
9bdf821fc1 SDK: Support "android.bat update sdk"
This ammends the batch file to recognize "android update sdk" to start
the updater UI.

SDK BUG 2173128 2173150

Change-Id: I3a2b9df9a3c52aa86bf34d05389c4034d60d57dc
2009-10-12 15:20:52 -07:00
Raphael
1b928c5a26 am 5ca98eb0: Merge change I5359971f into eclair
Merge commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1' into eclair-plus-aosp

* commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1':
  New "SDK Launcher" for Windows.
2009-10-12 14:23:29 -07:00
Raphael
acadcaca51 am 5ca98eb0: Merge change I5359971f into eclair
Merge commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1' into eclair-mr2

* commit '5ca98eb00860a76eef474f78b8c077c1c50f4dd1':
  New "SDK Launcher" for Windows.
2009-10-12 14:22:54 -07:00
Android (Google) Code Review
5ca98eb008 Merge change I5359971f into eclair
* changes:
  New "SDK Launcher" for Windows.
2009-10-12 17:13:23 -04:00
Raphael
e0a265f558 SDK Manager: suggest install of new platforms, addons or extra packages.
Supports the new "android update sdk" action.

Change-Id: Ib096f1f024639018252c58d4f9c8872ead3c39b9
2009-10-12 14:00:45 -07:00
Android (Google) Code Review
59ed13bb25 Merge change I204a77b2
* changes:
  New interactive functions to send commands to a device.
2009-10-12 16:03:24 -04:00
Raphael
0459a7dd1f am 6fb8880a: Merge change I26a21669 into eclair
Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-plus-aosp

* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
  Set SDK Platform/Doc to API 5.
2009-10-12 12:44:21 -07:00
Raphael
8583fb381b am 6fb8880a: Merge change I26a21669 into eclair
Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-mr2

* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
  Set SDK Platform/Doc to API 5.
2009-10-12 12:44:19 -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
Raphael
6265862dac am 86ff4a19: am 1121ceba: SDK: remove default.properties from ApiDemos
Merge commit '86ff4a1905474bbcbef9b174013fe02740f78a0d'

* commit '86ff4a1905474bbcbef9b174013fe02740f78a0d':
  SDK: remove default.properties from ApiDemos
2009-10-12 12:37:42 -07:00
Robert Greenwalt
e4aa9eb0e8 am d53aa9b9: Add Conn Man testing tools.
Merge commit 'd53aa9b917790c9f3480dd749b11707bd5c0f87a'

* commit 'd53aa9b917790c9f3480dd749b11707bd5c0f87a':
  Add Conn Man testing tools.
2009-10-12 12:36:32 -07:00
Android (Google) Code Review
6fb8880a48 Merge change I26a21669 into eclair
* changes:
  Set SDK Platform/Doc to API 5.
2009-10-12 15:36:08 -04: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
Raphael
529192dc0d am f4971e75: am ca35b275: Merge change I15034878 into eclair
Merge commit 'f4971e75d235e918d4dd28f421a7c3b66ac84068'

* commit 'f4971e75d235e918d4dd28f421a7c3b66ac84068':
  Fix Windows SDK build broken by layoutopt change.
2009-10-12 12:33:16 -07:00
Nicolas Catania
081e65d06f 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.
2009-10-12 12:09:05 -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