Commit Graph

3405 Commits

Author SHA1 Message Date
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
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
Romain Guy
7733721242 am 426a5b44: am d9050e61: Merge change Idc9b152e into eclair
Merge commit '426a5b44d8d7a7679feae836e98b7e94704fbcf8'

* commit '426a5b44d8d7a7679feae836e98b7e94704fbcf8':
  Add layoutopt to the SDK.
2009-10-12 11:40:41 -07:00
Raphael
7805c44caf New "SDK Launcher" for Windows.
This simple .exe will sit at the root of the Windows SDK
and currently simply executes tools\android.bat

It uses the same icon as the emulator.

Eventually it should simply replace the batch file.

Change-Id: I5359971fd476d6809d4ccb6bc0a0bcd34e30a3e6
2009-10-12 11:38: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
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