OSDN Git Service
Raphael [Mon, 12 Oct 2009 18:23:44 +0000 (11:23 -0700)]
am
1061c0c7: Merge change I69afafa4 into eclair
Merge commit '
1061c0c7dc20479626aa8b2d71485c9e17e7daf7'
* commit '
1061c0c7dc20479626aa8b2d71485c9e17e7daf7':
ADT: Create project from existing sample in New Project Wizard
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:39 +0000 (11:23 -0700)]
am
90ee703e: Fix resource resolution in the graphical layout editor.
Merge commit '
90ee703e945cedaa222e8e5a2aba6333afff21b6'
* commit '
90ee703e945cedaa222e8e5a2aba6333afff21b6':
Fix resource resolution in the graphical layout editor.
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:34 +0000 (11:23 -0700)]
am
d280d236: Monintor resolution/size chooser dialog
Merge commit '
d280d2363e412c43b1a7bfe044044d70d8895154'
* commit '
d280d2363e412c43b1a7bfe044044d70d8895154':
Monintor resolution/size chooser dialog
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:30 +0000 (11:23 -0700)]
am
d13d440d: Emulator launch options dialog.
Merge commit '
d13d440d43a744ab6e596e52cf53eef79d222d01'
* commit '
d13d440d43a744ab6e596e52cf53eef79d222d01':
Emulator launch options dialog.
Raphael [Mon, 12 Oct 2009 18:23:25 +0000 (11:23 -0700)]
am
ef133787: SDK: Fix CustomLocale to properly setup Language+Country
Merge commit '
ef1337876b2dfbf76dc7e45e035f4a25ebc0f560'
* commit '
ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
SDK: Fix CustomLocale to properly setup Language+Country
Jeff Sharkey [Mon, 12 Oct 2009 18:23:15 +0000 (11:23 -0700)]
am
480332f6: Revise template to match spec per jham.
Merge commit '
480332f6c5ee0da552426716abff5ddd87074a5f'
* commit '
480332f6c5ee0da552426716abff5ddd87074a5f':
Revise template to match spec per jham.
David 'Digit' Turner [Mon, 12 Oct 2009 18:23:11 +0000 (11:23 -0700)]
am
cc230ba0: Ensure the version of \'awk\' detected by host-setup.sh is used during the build
Merge commit '
cc230ba07c05ba5eec6412136ffebc4dd58e3aee'
* commit '
cc230ba07c05ba5eec6412136ffebc4dd58e3aee':
Ensure the version of 'awk' detected by host-setup.sh is used during the build
David 'Digit' Turner [Mon, 12 Oct 2009 18:23:06 +0000 (11:23 -0700)]
am
79adc9fc: Merge change Ia78a7753 into eclair
Merge commit '
79adc9fc9040760a722f2cc5fd15a517f4cbb245'
* commit '
79adc9fc9040760a722f2cc5fd15a517f4cbb245':
Remove bash-specific operator from build/host-setup.sh.
Xavier Ducrohet [Mon, 12 Oct 2009 18:23:01 +0000 (11:23 -0700)]
am
f0737030: Fix Android Manifest parser.
Merge commit '
f0737030570be15c1789d00db3593eb78cee9fbc'
* commit '
f0737030570be15c1789d00db3593eb78cee9fbc':
Fix Android Manifest parser.
Raphael [Mon, 12 Oct 2009 18:22:56 +0000 (11:22 -0700)]
am
2ace885b: ADT Manifest Editor: Fix for uses-sdk dup that won\'t go away.
Merge commit '
2ace885b2945aba76266bc54ad9fa59fb4e05187'
* commit '
2ace885b2945aba76266bc54ad9fa59fb4e05187':
ADT Manifest Editor: Fix for uses-sdk dup that won't go away.
Raphael [Mon, 12 Oct 2009 18:22:52 +0000 (11:22 -0700)]
am
657bdd7d: Merge change I8a575e49 into eclair
Merge commit '
657bdd7d2851cd3b09f156c4abd085614efdc593'
* commit '
657bdd7d2851cd3b09f156c4abd085614efdc593':
Fix CustomLocale to work with soft keyboard.
Xavier Ducrohet [Mon, 12 Oct 2009 18:22:47 +0000 (11:22 -0700)]
Raphael [Mon, 12 Oct 2009 18:22:42 +0000 (11:22 -0700)]
am
1233e408: Merge change Ie3124796 into eclair
Merge commit '
1233e408f77ad8752afa1387a94c8e2b378b6629'
* commit '
1233e408f77ad8752afa1387a94c8e2b378b6629':
Ignore adt/eclipse project files in CustomLocale
Xavier Ducrohet [Mon, 12 Oct 2009 18:22:37 +0000 (11:22 -0700)]
am
227b8768: Load default GLE device profiles from the SDK.
Merge commit '
227b8768fa8accff8a9e3555351af05d41ad7840'
* commit '
227b8768fa8accff8a9e3555351af05d41ad7840':
Load default GLE device profiles from the SDK.
Nicolas Catania [Fri, 9 Oct 2009 16:24:42 +0000 (09:24 -0700)]
Minor cleanup, fix documentation.
Refactored the tests for the makefile existence in a
separate function.
Ran checkdoc and fixed errors.
Nicolas Catania [Tue, 6 Oct 2009 17:45:44 +0000 (10:45 -0700)]
Added support for the number of jobs during a make.
Moved common functions in a new android-common.el file.
Declared a customizable variable to control the number
of jobs used during the make process.
In android-compile, call compile interactively to honor
the compile-read-command feature to give the user the opportunity
to edit the command (e.g add the snod target)
Nicolas Catania [Mon, 5 Oct 2009 21:49:14 +0000 (14:49 -0700)]
New module to compile android packages from emacs.
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.
Android (Google) Code Review [Fri, 2 Oct 2009 01:07:38 +0000 (21:07 -0400)]
Merge change Id5105cb7
* changes:
Remove adb networking support.
Elliott Hughes [Fri, 2 Oct 2009 00:46:38 +0000 (17:46 -0700)]
Remove adb networking support.
(Just removing a comment here.)
Bug:
1122968
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.
Xavier Ducrohet [Thu, 1 Oct 2009 20:47:48 +0000 (13:47 -0700)]
am
91175e6f: am
69940e9b: Merge change I77069a1e into eclair
Merge commit '
91175e6fdd24e57e297580934963b32cde500fb1'
* commit '
91175e6fdd24e57e297580934963b32cde500fb1':
Replace icon template with new style and multiple densities.
Xavier Ducrohet [Thu, 1 Oct 2009 20:46:46 +0000 (13:46 -0700)]
am
739c75d4: am
cc004309: Add a copy button to the screenshot dialog.
Merge commit '
739c75d4fa45c6b141e2ac71fb8b51677327ba0b'
* commit '
739c75d4fa45c6b141e2ac71fb8b51677327ba0b':
Add a copy button to the screenshot dialog.
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
Xavier Ducrohet [Thu, 1 Oct 2009 19:16:44 +0000 (12:16 -0700)]
am
dcec68b9: am
363c023b: Merge change Ie905f9b5 into eclair
Merge commit '
dcec68b99c0cc33a7f73fe3c2b0ef261e1e53a07'
* commit '
dcec68b99c0cc33a7f73fe3c2b0ef261e1e53a07':
Add support for xdpi and ydpi in the device config for the GLE.
Costin Manolache [Thu, 1 Oct 2009 18:50:48 +0000 (11:50 -0700)]
Chung-yih Wang [Thu, 1 Oct 2009 18:48:35 +0000 (11:48 -0700)]
am
6d74e724: am
84dcb451: Add unit test for new keystore.
Merge commit '
6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1'
* commit '
6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1':
Add unit test for new keystore.
Xavier Ducrohet [Thu, 1 Oct 2009 18:46:45 +0000 (11:46 -0700)]
am
085f4f29: (-s ours) am
3b5cbc54: am
fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '
085f4f29da60da8bed71b5f8ab2ba3b56cd4923e'
* commit '
085f4f29da60da8bed71b5f8ab2ba3b56cd4923e':
Merge the new Ant script rules and template from Eclair (do not merge)
Raphael [Thu, 1 Oct 2009 18:46:41 +0000 (11:46 -0700)]
am
4db669b9: am
603899e5: Merge change I95a34d28 into eclair
Merge commit '
4db669b91e576c9eaeb8e44af594953f85de3788'
* commit '
4db669b91e576c9eaeb8e44af594953f85de3788':
ADT XML String Refactoring: fix refusing to edit @+id/blah.
Xavier Ducrohet [Thu, 1 Oct 2009 18:46:36 +0000 (11:46 -0700)]
am
64b1e85c: (-s ours) am
1fed4884: am
559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '
64b1e85ce910c4282cc5ca94f800f6103ace2d0b'
* commit '
64b1e85ce910c4282cc5ca94f800f6103ace2d0b':
Move to 1.6_r2 (DO NOT MERGE)
Daniel Sandler [Thu, 1 Oct 2009 18:44:06 +0000 (11:44 -0700)]
am
b4e1e2e2: am
6f53211d: Merge change Ie022d478 into eclair
Merge commit '
b4e1e2e24c48c0a90bc4645113b164b419f31aa9'
* commit '
b4e1e2e24c48c0a90bc4645113b164b419f31aa9':
hdpi artwork for development/{apps,samples}.
Xavier Ducrohet [Thu, 1 Oct 2009 18:42:17 +0000 (11:42 -0700)]
am
c41c521c: am
fa4fb905: Merge change I96ff4429 into eclair
Merge commit '
c41c521cf324562a01c3939da2ed128d3772e332'
* commit '
c41c521cf324562a01c3939da2ed128d3772e332':
Add support for 'android update test-project'.
Brett Chabot [Thu, 1 Oct 2009 18:40:17 +0000 (11:40 -0700)]
am
8bc47e6e: am
7571d11b: Merge change I2cdb052a into eclair
Merge commit '
8bc47e6e3da18df72110630eb6fdde82caa7d30d'
* commit '
8bc47e6e3da18df72110630eb6fdde82caa7d30d':
Import testrunner changes from puppetmaster to keep them in sync.
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
Omari Stephens [Thu, 1 Oct 2009 18:40:12 +0000 (11:40 -0700)]
am
855489d1: am
e377fa60: Merge change I17a9df5a into eclair
Merge commit '
855489d1f98d7dd19e49acfc6b6c2d186334e998'
* commit '
855489d1f98d7dd19e49acfc6b6c2d186334e998':
Add contacts tests to the continuous test cycle
Raphael [Thu, 1 Oct 2009 18:38:34 +0000 (11:38 -0700)]
am
e73b8485: am
5ea7700f: Merge change Id5af7cf2 into eclair
Merge commit '
e73b8485a926ba1b4ec438b57e89c9c84200945a'
* commit '
e73b8485a926ba1b4ec438b57e89c9c84200945a':
Add xdpi and ydpi to layout-configs XML Schema.
David 'Digit' Turner [Thu, 1 Oct 2009 18:37:53 +0000 (11:37 -0700)]
am
0f4c48a4: am
b6d2a499: am
3c8d2e27: Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '
0f4c48a4c7398e9d678c5212ba73155e0694b61d'
* commit '
0f4c48a4c7398e9d678c5212ba73155e0694b61d':
Fix the skins to do proper dpad rotation in landscape mode.
Xavier Ducrohet [Thu, 1 Oct 2009 18:14:45 +0000 (11:14 -0700)]
am
0287e8dc: am
1028accb: Merge change Ic86de6e9 into eclair
Merge commit '
0287e8dc7605bb12f8e5fa9403414b034eb5ae19'
* commit '
0287e8dc7605bb12f8e5fa9403414b034eb5ae19':
Fix NPE when opening new layout file.
Dianne Hackborn [Thu, 1 Oct 2009 18:11:06 +0000 (11:11 -0700)]
am
f93f4d9c: am
5bc6141c: Add development setting for compatibility mode.
Merge commit '
f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b'
* commit '
f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b':
Add development setting for compatibility mode.
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.
Jean-Michel Trivi [Tue, 29 Sep 2009 18:10:58 +0000 (11:10 -0700)]
am
2296cfbd: am
8c77415e: Merge change Ic94b435b into eclair
Merge commit '
2296cfbd37e696bd32e92c88a30dd290c7470018'
* commit '
2296cfbd37e696bd32e92c88a30dd290c7470018':
Fix bug
2142296 where the user couldn't back out of the JetBoy demo.
Xavier Ducrohet [Tue, 29 Sep 2009 18:09:45 +0000 (11:09 -0700)]
am
ebe66dfe: am
9e4715e6: Fix ADT to use the new sdklib API
Merge commit '
ebe66dfea999e2e7bfe53f022938fbc273428b3d'
* commit '
ebe66dfea999e2e7bfe53f022938fbc273428b3d':
Fix ADT to use the new sdklib API
Xavier Ducrohet [Tue, 29 Sep 2009 18:08:41 +0000 (11:08 -0700)]
am
064380b1: am
7d762002: Merge change I097b444e into eclair
Merge commit '
064380b1edb326a6feb9d26b28bd590304eb1d7d'
* commit '
064380b1edb326a6feb9d26b28bd590304eb1d7d':
Fix ApiDemo Layout rendering test
Xavier Ducrohet [Tue, 29 Sep 2009 18:07:47 +0000 (11:07 -0700)]
am
8f608886: am
eafb009b: Merge change I663d4cb7 into eclair
Merge commit '
8f60888662e3728c16415aabb75d869757cf5639'
* commit '
8f60888662e3728c16415aabb75d869757cf5639':
Update the project creation (from the command line):
Xavier Ducrohet [Tue, 29 Sep 2009 18:07:43 +0000 (11:07 -0700)]
am
947561b3: am
c124b2ab: Merge change Ib1b01007 into eclair
Merge commit '
947561b337e35d7645f4efdb238fbc6f8281b3d5'
* commit '
947561b337e35d7645f4efdb238fbc6f8281b3d5':
Parse add-on supplied layout devices.
David 'Digit' Turner [Tue, 29 Sep 2009 18:06:55 +0000 (11:06 -0700)]
am
51c5bc22: am
fce2633d: Merge change I1dbeeca5 into eclair
Merge commit '
51c5bc22bee411cf17ecdec88c8f1c4258594f1f'
* commit '
51c5bc22bee411cf17ecdec88c8f1c4258594f1f':
Fix NDK usage of libgcc.a when building shared libraries
Xavier Ducrohet [Tue, 29 Sep 2009 18:06:28 +0000 (11:06 -0700)]
am
708c5b4f: am
e6ca35d4: Fix ResourceQualifier tests.
Merge commit '
708c5b4fa4384b032984031e439a2edd7ba0d7d9'
* commit '
708c5b4fa4384b032984031e439a2edd7ba0d7d9':
Fix ResourceQualifier tests.
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.
OSDN Git Service
