OSDN Git Service
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.
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
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.
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.
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
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
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.
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
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: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
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
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: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.
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.
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.
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 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
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 03:44:42 +0000 (20:44 -0700)]
Only create folder if not present.
Change-Id: I77673e0f43d7a00f42e2a97663bd9aed2aaf09f2
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
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
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
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 [Mon, 5 Oct 2009 22:19:38 +0000 (15:19 -0700)]
Add tests from layoutlib to adt-tests
Change-Id: Ia7bac7fad90b77fe34fb4a4371d6d5945993efe9
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.
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.
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
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 18:59:48 +0000 (14:59 -0400)]
Merge change I5dfb2567 into eclair
* changes:
Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.
Romain Guy [Mon, 5 Oct 2009 18:58:09 +0000 (11:58 -0700)]
Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.
Change-Id: I5dfb2567d923da8442b1df1e703e4ebca6e9523b
Fred Quintana [Sat, 3 Oct 2009 00:19:38 +0000 (17:19 -0700)]
account manager api review changes
Android (Google) Code Review [Mon, 5 Oct 2009 11:13:21 +0000 (07:13 -0400)]
Merge change I8e4697e1 into eclair
* changes:
New layout optimization tool. Run layoutopt on the command line.
Romain Guy [Mon, 5 Oct 2009 09:21:30 +0000 (02:21 -0700)]
New layout optimization tool. Run layoutopt on the command line.
Change-Id: I8e4697e19ca8a203dc8a41b464f7cb46d52184b0
Android (Google) Code Review [Sat, 3 Oct 2009 02:52:31 +0000 (22:52 -0400)]
Merge change I69afafa4 into eclair
* changes:
ADT: Create project from existing sample in New Project Wizard
Raphael [Sat, 3 Oct 2009 02:41:49 +0000 (19:41 -0700)]
ADT: Create project from existing sample in New Project Wizard
The UI workflow:
- user selects the new "Create project from existingsample" radio button
- user selects an SDK target in the NPW
- a popup is filled with all available samples
This also fixes 2 edge cases:
- when the selected sample contains a build|default.propertie that is
a base of the currently selected SDK target, don't reset it.
- when the user manually changes the project name or the app name for
the sample, simply empty the fields and the next selected sample
will recompute the adequate names. Any non-empty user input is never
overridden.
SDK BUG
2121819
Change-Id: I69afafa460b86942046ef6baca3d4c7ee7dbe97d
Xavier Ducrohet [Sat, 3 Oct 2009 00:40:52 +0000 (17:40 -0700)]
Fix resource resolution in the graphical layout editor.
Resource with qualifiers take precedence over the ones without
even if the qualifiers are not present on the requested configuration.
Change-Id: I0d19889064e8031179ea6ee13c93a4198fe971fd
Xavier Ducrohet [Fri, 2 Oct 2009 21:30:43 +0000 (14:30 -0700)]
Monintor resolution/size chooser dialog
This simple dialog lets the user choose a screen size (from a fixed list) and
a resolution (as returned by SWT's Display class).
This is used by the AVD start options dialog to help users figure out
the pixel density of their monitor.
Change-Id: I3eec0e7fac850c82e836d2bc0291a491f29f516e
Xavier Ducrohet [Fri, 2 Oct 2009 00:22:22 +0000 (17:22 -0700)]
Emulator launch options dialog.
This is displayed when clicking the Start button in the AVD manager.
The dialog allows to easily scale the emulator to match an arbitrary screen size
and to wipe the user data if needed.
The required monitor dpi is computed using java.awt.Toolkit, but (at least
on MacOS) it doesn't return the correct value, so it can be user supplied.
It's stored at least while the app is running and if possible in the settings
of the ADV/SDK Manager/Updater.
The wipe-data and scale flags are stored and reused while the app keeps
running as well.
Change-Id: Ia2f3ff5f4de285a3d505c6914d6b89cc663be284
Raphael [Fri, 2 Oct 2009 18:18:10 +0000 (11:18 -0700)]
SDK: Fix CustomLocale to properly setup Language+Country
SDK BUG
2154263
Change-Id: I74db5bc237921ff6a6fd55664a2a3c62f544081b
Jeff Sharkey [Fri, 2 Oct 2009 03:54:54 +0000 (20:54 -0700)]
Revise template to match spec per jham.
David 'Digit' Turner [Thu, 1 Oct 2009 23:44:54 +0000 (16:44 -0700)]
Ensure the version of 'awk' detected by host-setup.sh is used during the build
Android (Google) Code Review [Fri, 2 Oct 2009 03:26:50 +0000 (23:26 -0400)]
Merge change Ia78a7753 into eclair
* changes:
Remove bash-specific operator from build/host-setup.sh.
Xavier Ducrohet [Fri, 2 Oct 2009 00:06:58 +0000 (17:06 -0700)]
Fix Android Manifest parser.
While the test is in the java package as the parser, it's in a different
plug-in and this prevents accessing package-protected methods.
Change-Id: Ib17765095e4da518d62ee65cb9e1987d0e22be6e
David 'Digit' Turner [Thu, 1 Oct 2009 23:38:44 +0000 (16:38 -0700)]
Remove bash-specific operator from build/host-setup.sh.
Raphael [Thu, 1 Oct 2009 19:32:56 +0000 (12:32 -0700)]
ADT Manifest Editor: Fix for uses-sdk dup that won't go away.
It was a display issue only, meaning the actual XML node was
being deleted but the Ui model was not updated properly. The
actual cause is that this is a mandatory node, and mandatory
nodes must stay as "fake nodes" in the Ui model. However
only one such node needs to stay in the hierarchy.
SDK BUG
2147112
Change-Id: I68e3d343bb95169865ad8dcad77004cbd51fafc3
Android (Google) Code Review [Thu, 1 Oct 2009 20:54:48 +0000 (16:54 -0400)]
Merge change I8a575e49 into eclair
* changes:
Fix CustomLocale to work with soft keyboard.
Raphael [Thu, 1 Oct 2009 20:27:23 +0000 (13:27 -0700)]
Fix CustomLocale to work with soft keyboard.
SDK BUG
2154263
Change-Id: I8a575e49089ef2e6829e10749d796f6179330928
Xavier Ducrohet [Thu, 1 Oct 2009 19:54:02 +0000 (12:54 -0700)]
fix the build
Change-Id: Ica519f7e0adbc9fd48792198221c01da3e27fab8
Android (Google) Code Review [Thu, 1 Oct 2009 19:32:41 +0000 (15:32 -0400)]
Merge change Ie3124796 into eclair
* changes:
Ignore adt/eclipse project files in CustomLocale
Raphael [Thu, 1 Oct 2009 18:40:13 +0000 (11:40 -0700)]
Ignore adt/eclipse project files in CustomLocale
SDK BUG
2154263
Change-Id: Ie31247964058f8140f2bd5184a8b7deac4ad0381
Xavier Ducrohet [Thu, 1 Oct 2009 06:01:19 +0000 (23:01 -0700)]
Load default GLE device profiles from the SDK.
Change-Id: Ife64397692912f892ec81af8237ac31914830be9
Android (Google) Code Review [Thu, 1 Oct 2009 04:23:41 +0000 (00:23 -0400)]
Merge change I77069a1e into eclair
* changes:
Replace icon template with new style and multiple densities.
Xavier Ducrohet [Thu, 1 Oct 2009 03:22:07 +0000 (20:22 -0700)]
Replace icon template with new style and multiple densities.
The icon in the templates of ADT was medium density only.
I added new densities (high and low), as well as updated to
the new Eclair style. Also added a version for Ant project.
Updated ADT and sdklib to deal with creating new projects
with all 3 icons.
In case of Ant project, this is done only if the icons
are present in the target platforms.
For ADT, this is done only if the project target donut
or later. Older project still have only one icon located
in drawable/
Change-Id: I77069a1e4902ef395d490526aabc40a26e33d4ca
Xavier Ducrohet [Wed, 30 Sep 2009 23:56:21 +0000 (16:56 -0700)]
Add a copy button to the screenshot dialog.
This adds the screenshot to the clipboard.
Change-Id: I3509f2e5471588d749d67b70dd4d674cd0cd2057
Android (Google) Code Review [Wed, 30 Sep 2009 20:17:34 +0000 (16:17 -0400)]
Merge change Ie905f9b5 into eclair
* changes:
Add support for xdpi and ydpi in the device config for the GLE.
Xavier Ducrohet [Tue, 29 Sep 2009 23:10:34 +0000 (16:10 -0700)]
Add support for xdpi and ydpi in the device config for the GLE.
Change-Id: Ie905f9b586ac5f58e40e86232fbafeaacf6a0c51
Android (Google) Code Review [Wed, 30 Sep 2009 05:43:32 +0000 (01:43 -0400)]
Merge change I343737c9 into eclair
* changes:
Remove GAIA string
Chung-yih Wang [Tue, 29 Sep 2009 03:27:11 +0000 (11:27 +0800)]
Add unit test for new keystore.
+ change the package path.
+ add continuous flag.
Costin Manolache [Wed, 30 Sep 2009 01:57:40 +0000 (18:57 -0700)]
Remove GAIA string
Xavier Ducrohet [Wed, 30 Sep 2009 01:25:27 +0000 (18:25 -0700)]
am
fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '
fff9ff696709e17ad73ae654e511907282bfc0fd' into eclair
* commit '
fff9ff696709e17ad73ae654e511907282bfc0fd':
Merge the new Ant script rules and template from Eclair (do not merge)
Xavier Ducrohet [Wed, 30 Sep 2009 01:06:01 +0000 (18:06 -0700)]
Merge the new Ant script rules and template from Eclair (do not merge)
Android (Google) Code Review [Wed, 30 Sep 2009 01:05:44 +0000 (21:05 -0400)]
Merge change I95a34d28 into eclair
* changes:
ADT XML String Refactoring: fix refusing to edit @+id/blah.
Xavier Ducrohet [Wed, 30 Sep 2009 01:04:57 +0000 (18:04 -0700)]
am
559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '
559f26b0a5e80da467d97d42280c22e5044d7f30' into eclair
* commit '
559f26b0a5e80da467d97d42280c22e5044d7f30':
Move to 1.6_r2 (DO NOT MERGE)