OSDN Git Service
Xavier Ducrohet [Wed, 7 Oct 2009 18:40:54 +0000 (11:40 -0700)]
am
d13d440d: Emulator launch options dialog.
Merge commit '
d13d440d43a744ab6e596e52cf53eef79d222d01' into eclair-plus-aosp
* commit '
d13d440d43a744ab6e596e52cf53eef79d222d01':
Emulator launch options dialog.
Raphael [Wed, 7 Oct 2009 18:39:33 +0000 (11:39 -0700)]
am
ef133787: SDK: Fix CustomLocale to properly setup Language+Country
Merge commit '
ef1337876b2dfbf76dc7e45e035f4a25ebc0f560' into eclair-plus-aosp
* commit '
ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
SDK: Fix CustomLocale to properly setup Language+Country
Jeff Sharkey [Wed, 7 Oct 2009 18:36:58 +0000 (11:36 -0700)]
am
480332f6: Revise template to match spec per jham.
Merge commit '
480332f6c5ee0da552426716abff5ddd87074a5f' into eclair-plus-aosp
* commit '
480332f6c5ee0da552426716abff5ddd87074a5f':
Revise template to match spec per jham.
David 'Digit' Turner [Wed, 7 Oct 2009 18:35:22 +0000 (11:35 -0700)]
am
cc230ba0: Ensure the version of \'awk\' detected by host-setup.sh is used during the build
Merge commit '
cc230ba07c05ba5eec6412136ffebc4dd58e3aee' into eclair-plus-aosp
* commit '
cc230ba07c05ba5eec6412136ffebc4dd58e3aee':
Ensure the version of 'awk' detected by host-setup.sh is used during the build
David 'Digit' Turner [Wed, 7 Oct 2009 18:35:08 +0000 (11:35 -0700)]
am
79adc9fc: Merge change Ia78a7753 into eclair
Merge commit '
79adc9fc9040760a722f2cc5fd15a517f4cbb245' into eclair-plus-aosp
* commit '
79adc9fc9040760a722f2cc5fd15a517f4cbb245':
Remove bash-specific operator from build/host-setup.sh.
Xavier Ducrohet [Wed, 7 Oct 2009 18:34:21 +0000 (11:34 -0700)]
am
f0737030: Fix Android Manifest parser.
Merge commit '
f0737030570be15c1789d00db3593eb78cee9fbc' into eclair-plus-aosp
* commit '
f0737030570be15c1789d00db3593eb78cee9fbc':
Fix Android Manifest parser.
Raphael [Wed, 7 Oct 2009 18:33:12 +0000 (11:33 -0700)]
am
2ace885b: ADT Manifest Editor: Fix for uses-sdk dup that won\'t go away.
Merge commit '
2ace885b2945aba76266bc54ad9fa59fb4e05187' into eclair-plus-aosp
* commit '
2ace885b2945aba76266bc54ad9fa59fb4e05187':
ADT Manifest Editor: Fix for uses-sdk dup that won't go away.
Raphael [Wed, 7 Oct 2009 18:32:26 +0000 (11:32 -0700)]
am
657bdd7d: Merge change I8a575e49 into eclair
Merge commit '
657bdd7d2851cd3b09f156c4abd085614efdc593' into eclair-plus-aosp
* commit '
657bdd7d2851cd3b09f156c4abd085614efdc593':
Fix CustomLocale to work with soft keyboard.
Xavier Ducrohet [Wed, 7 Oct 2009 18:32:15 +0000 (11:32 -0700)]
Raphael [Wed, 7 Oct 2009 18:32:06 +0000 (11:32 -0700)]
am
1233e408: Merge change Ie3124796 into eclair
Merge commit '
1233e408f77ad8752afa1387a94c8e2b378b6629' into eclair-plus-aosp
* commit '
1233e408f77ad8752afa1387a94c8e2b378b6629':
Ignore adt/eclipse project files in CustomLocale
Xavier Ducrohet [Wed, 7 Oct 2009 18:32:01 +0000 (11:32 -0700)]
am
227b8768: Load default GLE device profiles from the SDK.
Merge commit '
227b8768fa8accff8a9e3555351af05d41ad7840' into eclair-plus-aosp
* commit '
227b8768fa8accff8a9e3555351af05d41ad7840':
Load default GLE device profiles from the SDK.
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
Xavier Ducrohet [Thu, 1 Oct 2009 04:32:17 +0000 (21:32 -0700)]
am
69940e9b: Merge change I77069a1e into eclair
Merge commit '
69940e9babbdf06c3a9942c4fbdd507479c847c9' into eclair-plus-aosp
* commit '
69940e9babbdf06c3a9942c4fbdd507479c847c9':
Replace icon template with new style and multiple densities.
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 04:17:05 +0000 (21:17 -0700)]
am
cc004309: Add a copy button to the screenshot dialog.
Merge commit '
cc004309b4905d8b8c86d97d74b92ff0d78c0323' into eclair-plus-aosp
* commit '
cc004309b4905d8b8c86d97d74b92ff0d78c0323':
Add a copy button to the screenshot dialog.
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
Xavier Ducrohet [Wed, 30 Sep 2009 20:24:26 +0000 (13:24 -0700)]
am
363c023b: Merge change Ie905f9b5 into eclair
Merge commit '
363c023be195d943859d3dfc775a453b6791ae4b' into eclair-plus-aosp
* commit '
363c023be195d943859d3dfc775a453b6791ae4b':
Add support for xdpi and ydpi in the device config for the GLE.
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
Costin Manolache [Wed, 30 Sep 2009 05:52:57 +0000 (22:52 -0700)]
am
aa3eaa70: Merge change I343737c9 into eclair
Merge commit '
aa3eaa70576530ff5db2de921164af847c7a7c86' into eclair-plus-aosp
* commit '
aa3eaa70576530ff5db2de921164af847c7a7c86':
Remove GAIA string
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 [Wed, 30 Sep 2009 04:25:56 +0000 (21:25 -0700)]
am
84dcb451: Add unit test for new keystore.
Merge commit '
84dcb451c210d6e93f5f516c27b781c067544895' into eclair-plus-aosp
* commit '
84dcb451c210d6e93f5f516c27b781c067544895':
Add unit test for new keystore.
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:36:15 +0000 (18:36 -0700)]
am
3b5cbc54: am
fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '
3b5cbc5472c96deb80d90fde815bff486fd82cba' into eclair-plus-aosp
* commit '
3b5cbc5472c96deb80d90fde815bff486fd82cba':
Merge the new Ant script rules and template from Eclair (do not merge)
Raphael [Wed, 30 Sep 2009 01:36:11 +0000 (18:36 -0700)]
am
603899e5: Merge change I95a34d28 into eclair
Merge commit '
603899e5a9c50bcfd2149c7932050fda0524ec6b' into eclair-plus-aosp
* commit '
603899e5a9c50bcfd2149c7932050fda0524ec6b':
ADT XML String Refactoring: fix refusing to edit @+id/blah.
Xavier Ducrohet [Wed, 30 Sep 2009 01:36:07 +0000 (18:36 -0700)]
am
1fed4884: am
559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '
1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp
* commit '
1fed48849dcadedb68211c5d55c1b452d05b98bc':
Move to 1.6_r2 (DO NOT MERGE)
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)
Daniel Sandler [Wed, 30 Sep 2009 01:01:01 +0000 (18:01 -0700)]
am
6f53211d: Merge change Ie022d478 into eclair
Merge commit '
6f53211d6d9095c67107ac72def6d405e33b7fac' into eclair-plus-aosp
* commit '
6f53211d6d9095c67107ac72def6d405e33b7fac':
hdpi artwork for development/{apps,samples}.
Android (Google) Code Review [Wed, 30 Sep 2009 00:51:06 +0000 (20:51 -0400)]
Merge change Ie022d478 into eclair
* changes:
hdpi artwork for development/{apps,samples}.
Daniel Sandler [Tue, 29 Sep 2009 20:30:07 +0000 (16:30 -0400)]
hdpi artwork for development/{apps,samples}.
(drop dated 29-Sep-2009)
Change-Id: Ie022d478ed4eafc641e475dad94f507a6c358595
Xavier Ducrohet [Tue, 29 Sep 2009 23:54:24 +0000 (16:54 -0700)]
am
fa4fb905: Merge change I96ff4429 into eclair
Merge commit '
fa4fb905877d879f2a593e0726108784f204dc5d' into eclair-plus-aosp
* commit '
fa4fb905877d879f2a593e0726108784f204dc5d':
Add support for 'android update test-project'.
Android (Google) Code Review [Tue, 29 Sep 2009 23:46:01 +0000 (19:46 -0400)]
Merge change I96ff4429 into eclair
* changes:
Add support for 'android update test-project'.
Raphael [Tue, 29 Sep 2009 23:02:33 +0000 (16:02 -0700)]
ADT XML String Refactoring: fix refusing to edit @+id/blah.
It correctly only refuses to edit @string/blah now.
This CL also does a bit of refactoring; I extracted some methods
and a class to make it a bit easier to read.
BUG
2066460
Change-Id: I95a34d28d6390ab0cc075f05ea83ceec04993ae9
Xavier Ducrohet [Tue, 29 Sep 2009 22:42:46 +0000 (15:42 -0700)]
Move to 1.6_r2 (DO NOT MERGE)
Brett Chabot [Tue, 29 Sep 2009 22:38:35 +0000 (15:38 -0700)]
am
7571d11b: Merge change I2cdb052a into eclair
Merge commit '
7571d11b7016b4dada3ad4db218c7d29214a13ba' into eclair-plus-aosp
* commit '
7571d11b7016b4dada3ad4db218c7d29214a13ba':
Import testrunner changes from puppetmaster to keep them in sync.
Omari Stephens [Tue, 29 Sep 2009 22:38:31 +0000 (15:38 -0700)]
am
e377fa60: Merge change I17a9df5a into eclair
Merge commit '
e377fa60d19b76a81b245f0e525652cdd22eb95f' into eclair-plus-aosp
* commit '
e377fa60d19b76a81b245f0e525652cdd22eb95f':
Add contacts tests to the continuous test cycle
Android (Google) Code Review [Tue, 29 Sep 2009 22:35:53 +0000 (18:35 -0400)]
Merge change I2cdb052a into eclair
* changes:
Import testrunner changes from puppetmaster to keep them in sync.
Brett Chabot [Tue, 29 Sep 2009 22:14:05 +0000 (15:14 -0700)]
Import testrunner changes from puppetmaster to keep them in sync.
Android (Google) Code Review [Tue, 29 Sep 2009 22:30:34 +0000 (18:30 -0400)]
Merge change I17a9df5a into eclair
* changes:
Add contacts tests to the continuous test cycle
Raphael [Tue, 29 Sep 2009 22:13:11 +0000 (15:13 -0700)]
am
5ea7700f: Merge change Id5af7cf2 into eclair
Merge commit '
5ea7700ffa5ee22012f88255f62aa4af7a1b840c' into eclair-plus-aosp
* commit '
5ea7700ffa5ee22012f88255f62aa4af7a1b840c':
Add xdpi and ydpi to layout-configs XML Schema.
Android (Google) Code Review [Tue, 29 Sep 2009 22:05:10 +0000 (18:05 -0400)]
Merge change Id5af7cf2 into eclair
* changes:
Add xdpi and ydpi to layout-configs XML Schema.
Raphael [Tue, 29 Sep 2009 19:14:05 +0000 (12:14 -0700)]
Add xdpi and ydpi to layout-configs XML Schema.
Also validate that whitespace around tokens is accepted.
BUG
2138329
Change-Id: Id5af7cf2b0689f05327a0cf0b17a525ceba78a12
David 'Digit' Turner [Tue, 29 Sep 2009 21:37:58 +0000 (14:37 -0700)]
am
b6d2a499: am
3c8d2e27: Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '
b6d2a4990a21b78355ff95d62fd698b1dddbd793' into eclair-plus-aosp
* commit '
b6d2a4990a21b78355ff95d62fd698b1dddbd793':
Fix the skins to do proper dpad rotation in landscape mode.
David 'Digit' Turner [Tue, 29 Sep 2009 21:28:08 +0000 (14:28 -0700)]
am
3c8d2e27: Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '
3c8d2e272b71cca814dd694c3ba548f4a2a3a0a0' into eclair
* commit '
3c8d2e272b71cca814dd694c3ba548f4a2a3a0a0':
Fix the skins to do proper dpad rotation in landscape mode.
Omari Stephens [Tue, 29 Sep 2009 21:16:07 +0000 (14:16 -0700)]
Add contacts tests to the continuous test cycle
David 'Digit' Turner [Fri, 18 Sep 2009 00:19:09 +0000 (17:19 -0700)]
Fix the skins to do proper dpad rotation in landscape mode.
Xavier Ducrohet [Tue, 29 Sep 2009 17:18:55 +0000 (10:18 -0700)]
am
1028accb: Merge change Ic86de6e9 into eclair
Merge commit '
1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp
* commit '
1028accb55919c0a84a4871002efb19a202c475c':
Fix NPE when opening new layout file.
Android (Google) Code Review [Tue, 29 Sep 2009 17:09:41 +0000 (13:09 -0400)]
Merge change Ic86de6e9 into eclair
* changes:
Fix NPE when opening new layout file.
Dianne Hackborn [Tue, 29 Sep 2009 07:15:28 +0000 (00:15 -0700)]
am
5bc6141c: Add development setting for compatibility mode.
Merge commit '
5bc6141cb29913d344b4a7881956af8b5074f560' into eclair-plus-aosp
* commit '
5bc6141cb29913d344b4a7881956af8b5074f560':
Add development setting for compatibility mode.
Dianne Hackborn [Tue, 29 Sep 2009 07:03:59 +0000 (00:03 -0700)]
Add development setting for compatibility mode.
Also some cleanup here and there.
Change-Id: Iebf563cf6ec2d0b1671a54bd534336e8fef4b9c0
Xavier Ducrohet [Tue, 29 Sep 2009 00:53:47 +0000 (17:53 -0700)]
Fix NPE when opening new layout file.
When adding the parsing of the device XML files, I mostly tested with a
layout file already opened when Eclipse launched.
Well it turns out there's a slightly different code path when opening a file
*after* Eclipse has launched. The load of the device UI in the config
selected caused a rendering before the XML model was loaded which ended
up in an NPE in the recomputeLayout method.
Additionnally, I hadn't finalized the code for the GLE2, so this brings it
in line with the GLE1.
Change-Id: Ic86de6e91ca13793aceecb5706bc963edddb9241
Xavier Ducrohet [Mon, 28 Sep 2009 23:25:45 +0000 (16:25 -0700)]
Add support for 'android update test-project'.
This is only to be used to update the location of the main project.
To update other properties, 'update project' can be used.
Change-Id: I96ff44295460c7e331953263abccea17108d5a70
Jean-Michel Trivi [Mon, 28 Sep 2009 22:23:31 +0000 (15:23 -0700)]
am
8c77415e: Merge change Ic94b435b into eclair
Merge commit '
8c77415ede684d89b738b3cf6cdaeaacd541eb87' into eclair-plus-aosp
* commit '
8c77415ede684d89b738b3cf6cdaeaacd541eb87':
Fix bug
2142296 where the user couldn't back out of the JetBoy demo.
Android (Google) Code Review [Mon, 28 Sep 2009 22:14:51 +0000 (18:14 -0400)]
Merge change Ic94b435b into eclair
* changes:
Fix bug
2142296 where the user couldn't back out of the JetBoy demo. The application was trapping the key up event on the back key. It worked on Donut because the framework implemented the "back" behavior on the key down. The fix consists in sending the key up event on the back button to the Activity class.
Jean-Michel Trivi [Mon, 28 Sep 2009 22:06:25 +0000 (15:06 -0700)]
Fix bug
2142296 where the user couldn't back out of the JetBoy demo.
The application was trapping the key up event on the back key. It
worked on Donut because the framework implemented the "back" behavior
on the key down. The fix consists in sending the key up event on the
back button to the Activity class.
Xavier Ducrohet [Mon, 28 Sep 2009 21:41:39 +0000 (14:41 -0700)]
am
9e4715e6: Fix ADT to use the new sdklib API
Merge commit '
9e4715e6d94e300605ab845c2e68bddaf8c23c8f' into eclair-plus-aosp
* commit '
9e4715e6d94e300605ab845c2e68bddaf8c23c8f':
Fix ADT to use the new sdklib API
Xavier Ducrohet [Mon, 28 Sep 2009 21:32:34 +0000 (14:32 -0700)]
Fix ADT to use the new sdklib API
ManifestConstants got renamed AndroidManifest but I
forgot to update ADT.
Change-Id: I60d40c63a67968c31789e91f14020c61114907ca
Xavier Ducrohet [Mon, 28 Sep 2009 21:00:18 +0000 (14:00 -0700)]
am
7d762002: Merge change I097b444e into eclair
Merge commit '
7d76200234bace44816f6328d2327ffb9d9c0a18' into eclair-plus-aosp
* commit '
7d76200234bace44816f6328d2327ffb9d9c0a18':
Fix ApiDemo Layout rendering test
Android (Google) Code Review [Mon, 28 Sep 2009 20:49:09 +0000 (16:49 -0400)]
Merge change I097b444e into eclair
* changes:
Fix ApiDemo Layout rendering test
Xavier Ducrohet [Mon, 28 Sep 2009 19:56:34 +0000 (12:56 -0700)]
Fix ApiDemo Layout rendering test
The issue came from a lack of device configuration and
missing default versions of some resources. We know use
an ADP1 configuration to choose the resources used by
the rendering.
Change-Id: I097b444e4fdc5572cfc53293a3215f1382f5d49c
Xavier Ducrohet [Mon, 28 Sep 2009 20:40:06 +0000 (13:40 -0700)]
am
eafb009b: Merge change I663d4cb7 into eclair
Merge commit '
eafb009baf48c876fa22409f862523966293d4d8' into eclair-plus-aosp
* commit '
eafb009baf48c876fa22409f862523966293d4d8':
Update the project creation (from the command line):
Xavier Ducrohet [Mon, 28 Sep 2009 20:40:02 +0000 (13:40 -0700)]
am
c124b2ab: Merge change Ib1b01007 into eclair
Merge commit '
c124b2ab7bb228a3363535c6697708a82016ce70' into eclair-plus-aosp
* commit '
c124b2ab7bb228a3363535c6697708a82016ce70':
Parse add-on supplied layout devices.
Android (Google) Code Review [Mon, 28 Sep 2009 20:33:57 +0000 (16:33 -0400)]
Merge change I663d4cb7 into eclair
* changes:
Update the project creation (from the command line):
Android (Google) Code Review [Mon, 28 Sep 2009 20:29:25 +0000 (16:29 -0400)]
Merge change Ib1b01007 into eclair
* changes:
Parse add-on supplied layout devices.
David 'Digit' Turner [Mon, 28 Sep 2009 20:03:49 +0000 (13:03 -0700)]
am
fce2633d: Merge change I1dbeeca5 into eclair
Merge commit '
fce2633d14323f837bfe0f58aee64006e76fe67d' into eclair-plus-aosp
* commit '
fce2633d14323f837bfe0f58aee64006e76fe67d':
Fix NDK usage of libgcc.a when building shared libraries
Android (Google) Code Review [Mon, 28 Sep 2009 19:53:19 +0000 (15:53 -0400)]
Merge change I1dbeeca5 into eclair
* changes:
Fix NDK usage of libgcc.a when building shared libraries
Xavier Ducrohet [Mon, 28 Sep 2009 19:33:55 +0000 (12:33 -0700)]
am
e6ca35d4: Fix ResourceQualifier tests.
Merge commit '
e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689' into eclair-plus-aosp
* commit '
e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689':
Fix ResourceQualifier tests.
Xavier Ducrohet [Mon, 28 Sep 2009 19:16:16 +0000 (12:16 -0700)]
Fix ResourceQualifier tests.
Change-Id: Ib6109c1bb76dadddeef24aec3af16e178a931651
David 'Digit' Turner [Thu, 24 Sep 2009 22:48:44 +0000 (15:48 -0700)]
Fix NDK usage of libgcc.a when building shared libraries
The main idea is that libgcc.a should appear after object files and
static libraries but before depending shared libraries. This willl
force the linker to copy the libgcc.a functions required by the
generated library into the target binary, instead of relying on
what's available in libc.so and others.
This ensures maximum portability, and prevent problems in the future
when we change the toolchain, which translates to different libgcc.a
functions embedded in libc.so and other exposed native libraries.
However, this will make also generated shared libraries bigger, because
the compiler insists on generating code that depends on a bunch of C++
support functions (even when building from C sources). An increase of
about 8KB per shared library is expected.
Xavier Ducrohet [Mon, 28 Sep 2009 04:39:07 +0000 (21:39 -0700)]
Parse add-on supplied layout devices.
Add-ons are expected to provide a file called devices.xml in their root
folder. The XML schema for this file is
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/layout-configs.xsd
I slightly fixed the schema so that normal screen size use the token
"normal" instead of "medium" to match the resource qualifier.
To round up the feature, the following changes are included:
- getEnum in the resource qualifier enum has been made public. There's no
sense in keeping it private and it'll help with people possibly using
valueOf which behaves differently (case sensitive so
ScreenSize.valueOf("normal") fails, while getEnum on the same string succeed.
- Updated the device configuration UI to deal with missing list of
devices while the SDK loads.
Change-Id: Ib1b01007d2ae7fd6398172c3549b2686c33d48be
Xavier Ducrohet [Fri, 25 Sep 2009 22:52:52 +0000 (15:52 -0700)]
Update the project creation (from the command line):
- Make the distinction between the activity class name, manifest entry,
fully-qualified name, and tested activity for the template place-holders.
Test activity names now directly contain the full name (including the
"Test" prefix) instead of the template adding it.
This is required by the new 'create test-project'
- New action: create test-project
This requires a path to the main project. It reads the package, activity
name and target from the main project.
The activity is read from the manifest and can be in a more complex form
than previously expected (for instance .subpackage.MyClass, instead of
simply MyClass). This is what required the re-work the activity related
template place holders.
Options:
-m --main Location path of the project to test, relative to the new
project [required]
-n --name Project name
-p --path Location path of the new project [required]
Example: for 2 projects MyProject and MyTests located in the same folder,
calling from their parent folder.
android create test-project -p MyTests -m ../MyProject
- build.properties now only gets application.package for older targets
as the new one get it directly from XPath
- Remove AndroidXPathFactory from the anttasks project as it was already
in sdklib which is a dependency.
- Removed IntelliJ templates for the SDK. We haven't supported them for
a while, and now that IntelliJ has built-in support for Android, it's
not that useful anymore.
While there is the command line parameters for 'update test-project'
it's not yet implemented.
Change-Id: I663d4cb7f439bb2abfe866f893e58f4d13aff975
Raphael [Mon, 28 Sep 2009 00:32:17 +0000 (17:32 -0700)]
am
3a683661: Merge change 27217 into eclair
Merge commit '
3a683661975908a9bfe2ef4ae5097a8d4ad75b53' into eclair-plus-aosp
* commit '
3a683661975908a9bfe2ef4ae5097a8d4ad75b53':
XML Schema for layout configurations.
Android (Google) Code Review [Mon, 28 Sep 2009 00:22:59 +0000 (20:22 -0400)]
Merge change 27217 into eclair
* changes:
XML Schema for layout configurations.
Raphael [Thu, 24 Sep 2009 22:38:55 +0000 (15:38 -0700)]
XML Schema for layout configurations.
The only changes to the original XML sample:
- the root element is called "layout-configs" (plural for container).
- the <default> and <config> elements must be defined in that order:
- 0..1 of <default>
folowed by
- 1..n of <config>
It's invalid for the <device> node to be empty.
default/config are defined by a <xsd:sequence>, which imposes the
strict ordering. At first I used an <xsd:choice> which does not
impose any ordering but then it becomes possible to define an
empty <device> element. I'd rather live with the strict ordering
(which also makes sense anyway) and enforce non-empty <device>
elements in the schema.
BUG
2138329
Change-Id: I581afb1d72825ae79df00d81c74c80a2a18680ad
Nicolas Catania [Sun, 27 Sep 2009 21:08:14 +0000 (14:08 -0700)]
am
31727ecb: Merge change 27167 into eclair
Merge commit '
31727ecbd99cd174fc713ca89c373adc117d7d73' into eclair-plus-aosp
* commit '
31727ecbd99cd174fc713ca89c373adc117d7d73':
Added a target to run the Contacts tests using runtest.
Android (Google) Code Review [Sun, 27 Sep 2009 20:56:53 +0000 (16:56 -0400)]
Merge change 27167 into eclair
* changes:
Added a target to run the Contacts tests using runtest.
Nicolas Catania [Fri, 25 Sep 2009 23:30:09 +0000 (16:30 -0700)]
Added a target to run the Contacts tests using runtest.
Dianne Hackborn [Fri, 25 Sep 2009 23:20:56 +0000 (16:20 -0700)]
am
bad9ac7f: Merge change 27163 into eclair
Merge commit '
bad9ac7f373f5585ee6e43926b21c470d07663f8' into eclair-plus-aosp
* commit '
bad9ac7f373f5585ee6e43926b21c470d07663f8':
Add transition animation sample, log to service sample.
Android (Google) Code Review [Fri, 25 Sep 2009 23:12:39 +0000 (19:12 -0400)]
Merge change 27163 into eclair
* changes:
Add transition animation sample, log to service sample.
Dianne Hackborn [Fri, 25 Sep 2009 02:27:54 +0000 (19:27 -0700)]
Add transition animation sample, log to service sample.
Change-Id: I7021a7fbbe26d9c52699d7c2216452a5bd51452b
Xavier Ducrohet [Fri, 25 Sep 2009 22:50:34 +0000 (15:50 -0700)]
am
0f61aa64: Sync DDMS/Traceview/Android version on the repository source.
Merge commit '
0f61aa6470c2ac6c8cae6c356bb7ce658b71b5ac' into eclair-plus-aosp
* commit '
0f61aa6470c2ac6c8cae6c356bb7ce658b71b5ac':
Sync DDMS/Traceview/Android version on the repository source.
Xavier Ducrohet [Fri, 25 Sep 2009 21:52:55 +0000 (14:52 -0700)]
Sync DDMS/Traceview/Android version on the repository source.
All apps now read source.properties located in SDK/tools
to know which version they. This is used in about box display
and in ping usage.
Change-Id: I6620c3eb703c32bfcdfd96e6a27bffc7a123b974