OSDN Git Service
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
Android (Google) Code Review [Fri, 9 Oct 2009 03:14:45 +0000 (23:14 -0400)]
Merge change I79297bbe into eclair-mr2
* changes:
Turn of log message that was accidentally left on in an earlier commit.
Jack Palevich [Fri, 9 Oct 2009 03:12:57 +0000 (20:12 -0700)]
Turn of log message that was accidentally left on in an earlier commit.
Raphael [Fri, 9 Oct 2009 00:36:29 +0000 (17:36 -0700)]
am
3334a587: Fix "android create project" to properly set name in strings.xml
Merge commit '
3334a5874e81a936cb866fd19f4beb7a425989ef' into eclair-mr2
* commit '
3334a5874e81a936cb866fd19f4beb7a425989ef':
Fix "android create project" to properly set name in strings.xml
Raphael [Fri, 9 Oct 2009 00:35:36 +0000 (17:35 -0700)]
am
8eff7f57: Support adb device-targeting arguments in ant scripts.
Merge commit '
8eff7f5779ba938ba7dcd981e0c6f3f97096dd26' into eclair-mr2
* commit '
8eff7f5779ba938ba7dcd981e0c6f3f97096dd26':
Support adb device-targeting arguments in ant scripts.
Xavier Ducrohet [Fri, 9 Oct 2009 00:31:26 +0000 (17:31 -0700)]
am
f40ac8d6: Merge change Ic4387354 into eclair
Merge commit '
f40ac8d60519c871e35a4ea4b80c6c64b13cbc3a' into eclair-mr2
* commit '
f40ac8d60519c871e35a4ea4b80c6c64b13cbc3a':
Make WVGA/High skins use a higher VM heap size.
Raphael [Fri, 9 Oct 2009 00:31:08 +0000 (17:31 -0700)]
am
97a6420d: Merge change I935c71f2 into eclair
Merge commit '
97a6420dcb6f2c936829d97ef5018d7e5595eeeb' into eclair-mr2
* commit '
97a6420dcb6f2c936829d97ef5018d7e5595eeeb':
Add sholes to Windows USB Driver in Eclair.
Raphael [Fri, 9 Oct 2009 00:30:47 +0000 (17:30 -0700)]
am
f3ae13d0: Merge change I7d549c26 into eclair
Merge commit '
f3ae13d06f1f7d9ad86248491fc2e76b07d5fd0f' into eclair-mr2
* commit '
f3ae13d06f1f7d9ad86248491fc2e76b07d5fd0f':
Add SdkUiLib tests to adt-tests.
Raphael [Fri, 9 Oct 2009 00:30:20 +0000 (17:30 -0700)]
am
0947e82e: Merge change Ica46d149 into eclair
Merge commit '
0947e82e4ec99de726829903ea67cbae3d4a9e66' into eclair-mr2
* commit '
0947e82e4ec99de726829903ea67cbae3d4a9e66':
SDK Updater: platform dependency on tools, addon dependency on platform.
Xavier Ducrohet [Fri, 9 Oct 2009 00:29:57 +0000 (17:29 -0700)]
am
9cb6feee: Merge change Ia20b55c7 into eclair
Merge commit '
9cb6feee3ae7b96be6d6829aef1a06c4b68b8e3e' into eclair-mr2
* commit '
9cb6feee3ae7b96be6d6829aef1a06c4b68b8e3e':
Add hardware support to AVD creation dialog.
Jean-Baptiste Queru [Fri, 9 Oct 2009 00:29:52 +0000 (17:29 -0700)]
am
b7c548eb: am
fb244224: merge from donut-gms
Merge commit '
b7c548eb237bc2383cf05ba41a8076743d75ab9a' into eclair-mr2
* commit '
b7c548eb237bc2383cf05ba41a8076743d75ab9a':
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.
Raphael [Thu, 8 Oct 2009 23:36:41 +0000 (16:36 -0700)]
SDK Updater: don't auto-expand archives when selecting a package
SDK BUG
2177033
Change-Id: I2c7af74e0dbbb3fc452e15e135b656a89bde4d31
Raphael [Thu, 8 Oct 2009 22:16:22 +0000 (15:16 -0700)]
Fix "android create project" to properly set name in strings.xml
Layout was wrong too.
SDK BUG
2176634
Change-Id: Ibbec1c47037d4a6dd875953c1875daaac4f11106
Raphael [Thu, 8 Oct 2009 22:02:10 +0000 (15:02 -0700)]
Support adb device-targeting arguments in ant scripts.
Example of usage:
$ ant install -Dadb.device.arg=-d
SDK BUG
2172690
Change-Id: I196441f9aab888b1356b4fc0255842570be5140f
Android (Google) Code Review [Thu, 8 Oct 2009 21:46:14 +0000 (17:46 -0400)]
Merge change Ic4387354 into eclair
* changes:
Make WVGA/High skins use a higher VM heap size.
Xavier Ducrohet [Thu, 8 Oct 2009 21:40:12 +0000 (14:40 -0700)]
Make WVGA/High skins use a higher VM heap size.
Change-Id: Ic43873545dd7a9482e4214ed3750a8e2108cafc6
Android (Google) Code Review [Thu, 8 Oct 2009 21:35:44 +0000 (17:35 -0400)]
Merge change I935c71f2 into eclair
* changes:
Add sholes to Windows USB Driver in Eclair.
Raphael [Mon, 21 Sep 2009 19:45:53 +0000 (12:45 -0700)]
Add sholes to Windows USB Driver in Eclair.
SDK BUG
2132512
Change-Id: I935c71f2fb689ed8e493e3375ad676f6f66a3f76
Android (Google) Code Review [Thu, 8 Oct 2009 21:20:28 +0000 (17:20 -0400)]
Merge change I7d549c26 into eclair
* changes:
Add SdkUiLib tests to adt-tests.
Android (Google) Code Review [Thu, 8 Oct 2009 19:51:29 +0000 (15:51 -0400)]
Merge change Ica46d149 into eclair
* changes:
SDK Updater: platform dependency on tools, addon dependency on platform.
Raphael [Wed, 7 Oct 2009 05:42:13 +0000 (22:42 -0700)]
SDK Updater: platform dependency on tools, addon dependency on platform.
SDK BUG
2040986
Change-Id: Ica46d14939bb3a9bf499899a0bf571456d4c6017
Android (Google) Code Review [Thu, 8 Oct 2009 18:35:38 +0000 (14:35 -0400)]
Merge change Ia20b55c7 into eclair
* changes:
Add hardware support to AVD creation dialog.
Jean-Baptiste Queru [Thu, 8 Oct 2009 17:43:28 +0000 (10:43 -0700)]
am
fb244224: merge from donut-gms
Merge commit '
fb244224235c33b492774f32e8caf8d43f2a3cec' into eclair
* commit '
fb244224235c33b492774f32e8caf8d43f2a3cec':
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 [Thu, 8 Oct 2009 17:36:37 +0000 (10:36 -0700)]
am
32739c61: Merge change I2e026098 into eclair
Merge commit '
32739c6183d525f371c37d923a85c1150a6a1b0d' into eclair-mr2
* commit '
32739c6183d525f371c37d923a85c1150a6a1b0d':
Three implementations of a live wallpaper showing a spinning cube.
Android (Google) Code Review [Thu, 8 Oct 2009 17:10:19 +0000 (13:10 -0400)]
Merge change I2e026098 into eclair
* changes:
Three implementations of a live wallpaper showing a spinning cube. One very basic, one slightly more elaborate (selectable shape, settings panel), and one that uses renderscript.
Jean-Baptiste Queru [Thu, 8 Oct 2009 17:00:39 +0000 (10:00 -0700)]
merge from donut-gms
Raphael [Thu, 8 Oct 2009 04:57:50 +0000 (21:57 -0700)]
Add SdkUiLib tests to adt-tests.
Also fixes the create_tests_symlink for Windows.
SDK BUG
2040986
Change-Id: I7d549c265efb9dbb5936ed7c9a7798eefee52d9b
Xavier Ducrohet [Thu, 8 Oct 2009 02:47:30 +0000 (19:47 -0700)]
Add hardware support to AVD creation dialog.
Change-Id: Ia20b55c788191b40159b5c38b66f1da333179ccc
Xavier Ducrohet [Wed, 7 Oct 2009 23:14:36 +0000 (16:14 -0700)]
am
211195d1: Merge change I0d2bc2d1 into eclair
Merge commit '
211195d1931da4a77ffb42dc15a9bf5afdd6b52a' into eclair-mr2
* commit '
211195d1931da4a77ffb42dc15a9bf5afdd6b52a':
New based dialog class.
Android (Google) Code Review [Wed, 7 Oct 2009 23:08:05 +0000 (19:08 -0400)]
Merge change I0d2bc2d1 into eclair
* changes:
New based dialog class.
Xavier Ducrohet [Wed, 7 Oct 2009 21:30:42 +0000 (14:30 -0700)]
New based dialog class.
This simply (for now) extends the jface dialog to properly
set it up.
Change-Id: I0d2bc2d10aad3811201f9d1df3efbfc87be50cb4
Raphael [Wed, 7 Oct 2009 22:53:59 +0000 (15:53 -0700)]
am
1121ceba: SDK: remove default.properties from ApiDemos
Merge commit '
1121ceba04131669a95e6cc7e3cb83a3a87c8ea2' into eclair-mr2
* commit '
1121ceba04131669a95e6cc7e3cb83a3a87c8ea2':
SDK: remove default.properties from ApiDemos
Raphael [Wed, 7 Oct 2009 22:18:12 +0000 (15:18 -0700)]
SDK: remove default.properties from ApiDemos
It's annoying to have to maintain this. Remove it and understand
why we needed it in the first place. If we do, we'll generate
it when packaging the SDK rather than have it in the tree.
SDK BUG
2144477
Robert Greenwalt [Tue, 6 Oct 2009 22:12:40 +0000 (15:12 -0700)]
Add Conn Man testing tools.
First test toggles wifi on/off forever (must have wifi associated to start,
or at least a remembered network in range)
Second test toggles the screen on off so you can test wifi cycle from that point.
Lastly adds some network-feature tests using mms or hipri net features.
bug:
2170806
Romain Guy [Wed, 7 Oct 2009 19:42:20 +0000 (12:42 -0700)]
am
9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.
Merge commit '
9bda7101b8c7007e65f0a744d93e4e446086f3ec' into eclair-mr2
* commit '
9bda7101b8c7007e65f0a744d93e4e446086f3ec':
Fix the MergeRootFrameLayout rule by checking the presence of padding.
Xavier Ducrohet [Wed, 7 Oct 2009 19:42:16 +0000 (12:42 -0700)]
am
7ce7a783: Merge change I47bf273a into eclair
Merge commit '
7ce7a7835d1f2c835451f3222b14ab44350d66ba' into eclair-mr2
* commit '
7ce7a7835d1f2c835451f3222b14ab44350d66ba':
Update AVD creation UI to be easier for skin/sdcard.
Xavier Ducrohet [Wed, 7 Oct 2009 19:42:12 +0000 (12:42 -0700)]
am
740e6ef0: Merge change Iafd22833 into eclair
Merge commit '
740e6ef010d99b782632a8476e65d5c667cad85a' into eclair-mr2
* commit '
740e6ef010d99b782632a8476e65d5c667cad85a':
Add git ignore file for ninepatch eclipse project.
Romain Guy [Wed, 7 Oct 2009 19:31:17 +0000 (12:31 -0700)]
Fix the MergeRootFrameLayout rule by checking the presence of padding.
Change-Id: I3a8b257025e74f6899233d9b99f7f86b5675e997
Android (Google) Code Review [Wed, 7 Oct 2009 00:19:28 +0000 (20:19 -0400)]
Merge change I47bf273a into eclair
* changes:
Update AVD creation UI to be easier for skin/sdcard.
Android (Google) Code Review [Wed, 7 Oct 2009 00:19:02 +0000 (20:19 -0400)]
Merge change Iafd22833 into eclair
* changes:
Add git ignore file for ninepatch eclipse project.
Xavier Ducrohet [Tue, 6 Oct 2009 23:54:20 +0000 (16:54 -0700)]
Update AVD creation UI to be easier for skin/sdcard.
BUG:
2162198
Change-Id: I47bf273a730a1bf6e0c3f47fb5247f02d06259a5
Xavier Ducrohet [Tue, 6 Oct 2009 23:59:38 +0000 (16:59 -0700)]
Add git ignore file for ninepatch eclipse project.
Change-Id: Iafd228336791a4a5b3b9443ba7ea075f8bf1d8a0
Raphael [Tue, 6 Oct 2009 23:56:30 +0000 (16:56 -0700)]
am
ca35b275: Merge change I15034878 into eclair
Merge commit '
ca35b27533f920f304c6065537ffc5185c2022e5' into eclair-mr2
* commit '
ca35b27533f920f304c6065537ffc5185c2022e5':
Fix Windows SDK build broken by layoutopt change.
Android (Google) Code Review [Tue, 6 Oct 2009 23:46:08 +0000 (19:46 -0400)]
Merge change I15034878 into eclair
* changes:
Fix Windows SDK build broken by layoutopt change.
Raphael [Tue, 6 Oct 2009 23:43:05 +0000 (16:43 -0700)]
Fix Windows SDK build broken by layoutopt change.
Change-Id: I1503487861ef20dead3de62548feea6328e0d60d
Romain Guy [Tue, 6 Oct 2009 23:33:57 +0000 (16:33 -0700)]
am
ece784c5: Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
Merge commit '
ece784c583edbbeb56e8a74d4ddf039121d0df71' into eclair-mr2
* commit '
ece784c583edbbeb56e8a74d4ddf039121d0df71':
Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
Romain Guy [Tue, 6 Oct 2009 23:22:58 +0000 (16:22 -0700)]
Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
Change-Id: I2ab9b3c6b57744563c87cb8457c55afd0cbfcb57
Marco Nelissen [Tue, 6 Oct 2009 23:00:27 +0000 (16:00 -0700)]
Three implementations of a live wallpaper showing a spinning cube.
One very basic, one slightly more elaborate (selectable shape, settings panel), and one that uses renderscript.
Xavier Ducrohet [Tue, 6 Oct 2009 22:28:16 +0000 (15:28 -0700)]
am
b5c18403: Merge change Idc3d3b2f into eclair
Merge commit '
b5c1840392bf93edd8caaefb7136b46f2b369773' into eclair-mr2
* commit '
b5c1840392bf93edd8caaefb7136b46f2b369773':
Moved the test data to their own package.
Android (Google) Code Review [Tue, 6 Oct 2009 22:19:28 +0000 (18:19 -0400)]
Merge change Idc3d3b2f into eclair
* changes:
Moved the test data to their own package.
Romain Guy [Tue, 6 Oct 2009 22:05:06 +0000 (15:05 -0700)]
am
2aaa22e0: Merge change Id7515f9a into eclair
Merge commit '
2aaa22e0575faf6c83990233333fbf010fa46ef3' into eclair-mr2
* commit '
2aaa22e0575faf6c83990233333fbf010fa46ef3':
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
Android (Google) Code Review [Tue, 6 Oct 2009 21:56:15 +0000 (17:56 -0400)]
Merge change Id7515f9a into eclair
* changes:
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
Xavier Ducrohet [Tue, 6 Oct 2009 19:44:24 +0000 (12:44 -0700)]
am
8f242703: Merge change I56443773 into eclair
Merge commit '
8f242703341e616f9239706a27f5ecb675f808e7' into eclair-mr2
* commit '
8f242703341e616f9239706a27f5ecb675f808e7':
Add support for loading 9-patch from a stream.
Xavier Ducrohet [Tue, 6 Oct 2009 19:44:20 +0000 (12:44 -0700)]
am
89482588: Merge change Iddb7f466 into eclair
Merge commit '
894825887e9668872c1925704afcf3340b7c009b' into eclair-mr2
* commit '
894825887e9668872c1925704afcf3340b7c009b':
Put kxml back in adt-test
Android (Google) Code Review [Tue, 6 Oct 2009 19:35:46 +0000 (15:35 -0400)]
Merge change I56443773 into eclair
* changes:
Add support for loading 9-patch from a stream.
Xavier Ducrohet [Tue, 6 Oct 2009 19:10:42 +0000 (12:10 -0700)]
Add support for loading 9-patch from a stream.
This will be used by the tests.
Also added the eclipse project files.
Change-Id: I56443773d90594475fc3f14464d48e56d5a1bbb5
Xavier Ducrohet [Tue, 6 Oct 2009 19:02:35 +0000 (12:02 -0700)]
Moved the test data to their own package.
This allows us to select the whole package for binary inclusion
in adt-test (which doesn't automatically take any non java file for
packaging)
Change-Id: Idc3d3b2f27623de1b0fccd7e01dd88948923081c
Romain Guy [Tue, 6 Oct 2009 18:37:46 +0000 (11:37 -0700)]
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
This change also refactors the uix library to remove an unnecessary class (LayoutNode.)
The refactoring helps writing cleaner script by accessing only the node object instead
of xml and node. This change also augment the capabilities of the node in Groovy scripts.
Change-Id: Id7515f9a79826909834d82496a6d9dfbc19988ad
Android (Google) Code Review [Tue, 6 Oct 2009 18:16:58 +0000 (14:16 -0400)]
Merge change Iddb7f466 into eclair
* changes:
Put kxml back in adt-test
Romain Guy [Tue, 6 Oct 2009 18:11:42 +0000 (11:11 -0700)]
am
16a56b8c: Fix NPE in layoutopt when trying to open non-XML files.
Merge commit '
16a56b8ccd39c812c8c7b86bd83ec9c492d19de9' into eclair-mr2
* commit '
16a56b8ccd39c812c8c7b86bd83ec9c492d19de9':
Fix NPE in layoutopt when trying to open non-XML files.
Romain Guy [Tue, 6 Oct 2009 17:51:05 +0000 (10:51 -0700)]
Fix NPE in layoutopt when trying to open non-XML files.
Change-Id: I59900c35996ce4465e2ecfd2eb26a19e3fa66403
Xavier Ducrohet [Tue, 6 Oct 2009 17:45:18 +0000 (10:45 -0700)]
Put kxml back in adt-test
Since adt doesn't export the package, it's just easier that way.
Change-Id: Iddb7f4660ccc0bc51374128a544975596cb051aa
Romain Guy [Tue, 6 Oct 2009 17:14:25 +0000 (10:14 -0700)]
am
d9050e61: Merge change Idc9b152e into eclair
Merge commit '
d9050e6102fb37c8f5df02dbfd17cac728b9f0e4' into eclair-mr2
* commit '
d9050e6102fb37c8f5df02dbfd17cac728b9f0e4':
Add layoutopt to the SDK.
Android (Google) Code Review [Tue, 6 Oct 2009 17:05:53 +0000 (13:05 -0400)]
Merge change Idc9b152e into eclair
* changes:
Add layoutopt to the SDK.
Xavier Ducrohet [Tue, 6 Oct 2009 04:06:37 +0000 (21:06 -0700)]
am
67d9bcdf: Only create folder if not present.
Merge commit '
67d9bcdf5cfe8c2862280ea6e55c4beed05432ef' into eclair-mr2
* commit '
67d9bcdf5cfe8c2862280ea6e55c4beed05432ef':
Only create folder if not present.
Xavier Ducrohet [Tue, 6 Oct 2009 03:44:42 +0000 (20:44 -0700)]
Only create folder if not present.
Change-Id: I77673e0f43d7a00f42e2a97663bd9aed2aaf09f2
Xavier Ducrohet [Tue, 6 Oct 2009 03:20:11 +0000 (20:20 -0700)]
am
8251e4ef: Merge change Iab62c8e9 into eclair
Merge commit '
8251e4ef4672be54a3f38748c05fd66c967c64b4' into eclair-mr2
* commit '
8251e4ef4672be54a3f38748c05fd66c967c64b4':
Add layoutlib.jar to the classpath of adt-tests
Android (Google) Code Review [Tue, 6 Oct 2009 03:09:40 +0000 (23:09 -0400)]
Merge change Iab62c8e9 into eclair
* changes:
Add layoutlib.jar to the classpath of adt-tests
Xavier Ducrohet [Tue, 6 Oct 2009 03:08:31 +0000 (20:08 -0700)]
Add layoutlib.jar to the classpath of adt-tests
Change-Id: Iab62c8e9849873e91640484c70110660aabd4b8e
Xavier Ducrohet [Tue, 6 Oct 2009 02:44:34 +0000 (19:44 -0700)]
am
ee7c4739: Merge change Ic1eff784 into eclair
Merge commit '
ee7c473929c62bb9f9f0e21e9ca850174b9041a1' into eclair-mr2
* commit '
ee7c473929c62bb9f9f0e21e9ca850174b9041a1':
Fix script (and build)
Romain Guy [Tue, 6 Oct 2009 01:11:09 +0000 (18:11 -0700)]
Add layoutopt to the SDK.
Change-Id: Idc9b152e2a5abffaa9feb2cf70791d8288cfa1dd
Android (Google) Code Review [Tue, 6 Oct 2009 02:35:24 +0000 (22:35 -0400)]
Merge change Ic1eff784 into eclair
* changes:
Fix script (and build)
Xavier Ducrohet [Tue, 6 Oct 2009 02:33:35 +0000 (19:33 -0700)]
Fix script (and build)
Change-Id: Ic1eff7843219c42867e477ad8bfbdf89167a0061
Romain Guy [Tue, 6 Oct 2009 01:15:03 +0000 (18:15 -0700)]
am
b7e69d20: Merge change Ic8fe0b36 into eclair
Merge commit '
b7e69d20a42297d0d80a0a0a0f88320d8e536ff5' into eclair-mr2
* commit '
b7e69d20a42297d0d80a0a0a0f88320d8e536ff5':
Add 3 more rules to layoutopt/uix:
Android (Google) Code Review [Tue, 6 Oct 2009 01:07:00 +0000 (21:07 -0400)]
Merge change Ic8fe0b36 into eclair
* changes:
Add 3 more rules to layoutopt/uix: - InefficientWeight - NestedScrollingWidgets - TooManyChildren
Romain Guy [Tue, 6 Oct 2009 01:05:44 +0000 (18:05 -0700)]
Add 3 more rules to layoutopt/uix:
- InefficientWeight
- NestedScrollingWidgets
- TooManyChildren
Change-Id: Ic8fe0b36e0a7cac523d223e5f8d96d7959919da6
Dianne Hackborn [Tue, 6 Oct 2009 00:42:28 +0000 (17:42 -0700)]
am
d2fc4352: Merge change I6b618094 into eclair
Merge commit '
d2fc4352293b3c9c3a3570a52826f6d98d0d052c' into eclair-mr2
* commit '
d2fc4352293b3c9c3a3570a52826f6d98d0d052c':
Fix build.
Android (Google) Code Review [Tue, 6 Oct 2009 00:36:06 +0000 (20:36 -0400)]
Merge change I6b618094 into eclair
* changes:
Fix build.
Dianne Hackborn [Tue, 6 Oct 2009 00:35:26 +0000 (17:35 -0700)]
Fix build.
Change-Id: I6b6180942d102745bd5717fcc5d0ea9e00211f18
Xavier Ducrohet [Tue, 6 Oct 2009 00:10:56 +0000 (17:10 -0700)]
am
24bf2fa3: Add tests from layoutlib to adt-tests
Merge commit '
24bf2fa3e4aebc0aa311dd3a14ea60f4af56fa39' into eclair-mr2
* commit '
24bf2fa3e4aebc0aa311dd3a14ea60f4af56fa39':
Add tests from layoutlib to adt-tests
Xavier Ducrohet [Mon, 5 Oct 2009 22:19:38 +0000 (15:19 -0700)]
Add tests from layoutlib to adt-tests
Change-Id: Ia7bac7fad90b77fe34fb4a4371d6d5945993efe9
Xavier Ducrohet [Mon, 5 Oct 2009 21:52:17 +0000 (14:52 -0700)]
am
b6e85c05: Merge change Ieb4e722b into eclair
Merge commit '
b6e85c0548be6b52e11e64f893cc6e5d49a740f2' into eclair-mr2
* commit '
b6e85c0548be6b52e11e64f893cc6e5d49a740f2':
Add sdklib tests to the adt-tests Unit tests.
Android (Google) Code Review [Mon, 5 Oct 2009 21:45:04 +0000 (17:45 -0400)]
Merge change Ieb4e722b into eclair
* changes:
Add sdklib tests to the adt-tests Unit tests.
Brett Chabot [Mon, 5 Oct 2009 21:35:14 +0000 (14:35 -0700)]
am
6cc64cd2: Merge change I90b4c0e7 into eclair
Merge commit '
6cc64cd26d1ce9319dd2f430b564b8b2de9b482f' into eclair-mr2
* commit '
6cc64cd26d1ce9319dd2f430b564b8b2de9b482f':
Fix Eclipse sample tests.
Android (Google) Code Review [Mon, 5 Oct 2009 21:26:31 +0000 (17:26 -0400)]
Merge change I90b4c0e7 into eclair
* changes:
Fix Eclipse sample tests.
Android (Google) Code Review [Mon, 5 Oct 2009 21:00:09 +0000 (17:00 -0400)]
Merge change I27666897 into eclair-mr2
* changes:
Make robot.png a raw resource.
Jack Palevich [Mon, 5 Oct 2009 20:59:20 +0000 (13:59 -0700)]
Make robot.png a raw resource.
After all, it's being used as a raw resource.
Android (Google) Code Review [Mon, 5 Oct 2009 20:44:20 +0000 (16:44 -0400)]
Merge change Ia7a9186b into eclair-mr2
* changes:
Remove non-working high-res robot texture.
Jack Palevich [Mon, 5 Oct 2009 20:40:44 +0000 (13:40 -0700)]
Remove non-working high-res robot texture.
This was added with good intentions, as part of the general drive to
provide high-res textures.
Unfortunately, most OpenGL ES drivers require that a texture's dimensions
be a power of two on each side. The original texture was 128 x 128, and
someone helpfully created a 192 x 192 high res texture. But 192 is not
a power of two, so the hihg-res texture would not render.
We could create a 256 x 256 texture, which would work, but that's not
really needed for this particular texture, and we'd prefer if the
texture stayed small for rendering performance reasons.
Brett Chabot [Sat, 3 Oct 2009 00:34:05 +0000 (17:34 -0700)]
Fix Eclipse sample tests.
Xavier Ducrohet [Mon, 5 Oct 2009 19:39:53 +0000 (12:39 -0700)]
Add sdklib tests to the adt-tests Unit tests.
Change-Id: Ieb4e722b1b5a29cef250e2cb5575a71e09f956c3
Xavier Ducrohet [Mon, 5 Oct 2009 19:42:12 +0000 (12:42 -0700)]
am
e96bc57a: Merge change I7d761ffa into eclair
Merge commit '
e96bc57aad64d435c1986bf415cb1c5f974426b9' into eclair-mr2
* commit '
e96bc57aad64d435c1986bf415cb1c5f974426b9':
Fix best match resource selection when there's only one match.
Romain Guy [Mon, 5 Oct 2009 19:42:08 +0000 (12:42 -0700)]
am
06d3ec15: Only process XML files in layoutopt.
Merge commit '
06d3ec157ee7bebbf550924af267ee168336e085' into eclair-mr2
* commit '
06d3ec157ee7bebbf550924af267ee168336e085':
Only process XML files in layoutopt.
Romain Guy [Mon, 5 Oct 2009 19:42:04 +0000 (12:42 -0700)]
am
d01b8dd3: Merge change I5dfb2567 into eclair
Merge commit '
d01b8dd3c73add238bb4b632ece4a42e44bae126' into eclair-mr2
* commit '
d01b8dd3c73add238bb4b632ece4a42e44bae126':
Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.
Android (Google) Code Review [Mon, 5 Oct 2009 19:29:16 +0000 (15:29 -0400)]
Merge change I7d761ffa into eclair
* changes:
Fix best match resource selection when there's only one match.
Xavier Ducrohet [Mon, 5 Oct 2009 19:15:08 +0000 (12:15 -0700)]
Fix best match resource selection when there's only one match.
Was using the wrong index.
Change-Id: I7d761ffa553f0aeec176a4752185dde238991e5e
Romain Guy [Mon, 5 Oct 2009 19:08:48 +0000 (12:08 -0700)]
Only process XML files in layoutopt.
Change-Id: I847109409601ccfbb10abff3b9972afdb3032821
Android (Google) Code Review [Mon, 5 Oct 2009 19:02:04 +0000 (15:02 -0400)]
Merge change I108ad940 into eclair-mr2
* changes:
Adding a full screen video sample plugin. Also cleaned up surface plugins to use the provided JavaVM.
Android (Google) Code Review [Mon, 5 Oct 2009 18:59:48 +0000 (14:59 -0400)]
Merge change I5dfb2567 into eclair
* changes:
Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.
OSDN Git Service
