Commit Graph

2396 Commits

Author SHA1 Message Date
Xavier Ducrohet
3b10d94a49 am d13d440d: Emulator launch options dialog.
Merge commit 'd13d440d43a744ab6e596e52cf53eef79d222d01'

* commit 'd13d440d43a744ab6e596e52cf53eef79d222d01':
  Emulator launch options dialog.
2009-10-12 11:23:30 -07:00
Raphael
15fdd346a2 am ef133787: SDK: Fix CustomLocale to properly setup Language+Country
Merge commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560'

* commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
  SDK: Fix CustomLocale to properly setup Language+Country
2009-10-12 11:23:25 -07:00
Jeff Sharkey
65ab5053c9 am 480332f6: Revise template to match spec per jham.
Merge commit '480332f6c5ee0da552426716abff5ddd87074a5f'

* commit '480332f6c5ee0da552426716abff5ddd87074a5f':
  Revise template to match spec per jham.
2009-10-12 11:23:15 -07:00
David 'Digit' Turner
ce3ff41ba0 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
2009-10-12 11:23:11 -07:00
David 'Digit' Turner
3264e24b22 am 79adc9fc: Merge change Ia78a7753 into eclair
Merge commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245'

* commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245':
  Remove bash-specific operator from build/host-setup.sh.
2009-10-12 11:23:06 -07:00
Xavier Ducrohet
cfa2b8acd3 am f0737030: Fix Android Manifest parser.
Merge commit 'f0737030570be15c1789d00db3593eb78cee9fbc'

* commit 'f0737030570be15c1789d00db3593eb78cee9fbc':
  Fix Android Manifest parser.
2009-10-12 11:23:01 -07:00
Raphael
122c3dd9c6 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.
2009-10-12 11:22:56 -07:00
Raphael
4e53735ede am 657bdd7d: Merge change I8a575e49 into eclair
Merge commit '657bdd7d2851cd3b09f156c4abd085614efdc593'

* commit '657bdd7d2851cd3b09f156c4abd085614efdc593':
  Fix CustomLocale to work with soft keyboard.
2009-10-12 11:22:52 -07:00
Xavier Ducrohet
cd53b3bc5a am 2cdd16b7: fix the build
Merge commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652'

* commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652':
  fix the build
2009-10-12 11:22:47 -07:00
Raphael
9729e97806 am 1233e408: Merge change Ie3124796 into eclair
Merge commit '1233e408f77ad8752afa1387a94c8e2b378b6629'

* commit '1233e408f77ad8752afa1387a94c8e2b378b6629':
  Ignore adt/eclipse project files in CustomLocale
2009-10-12 11:22:42 -07:00
Xavier Ducrohet
6a368fcf3e am 227b8768: Load default GLE device profiles from the SDK.
Merge commit '227b8768fa8accff8a9e3555351af05d41ad7840'

* commit '227b8768fa8accff8a9e3555351af05d41ad7840':
  Load default GLE device profiles from the SDK.
2009-10-12 11:22:37 -07:00
Nicolas Catania
4a5dc7e0c3 Minor cleanup, fix documentation.
Refactored the tests for the makefile existence in a
separate function.
Ran checkdoc and fixed errors.
2009-10-09 09:29:33 -07:00
Nicolas Catania
f94bca2ab7 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)
2009-10-06 17:15:21 -07:00
Nicolas Catania
1925281cfa New module to compile android packages from emacs. 2009-10-05 16:51:09 -07:00
Xavier Ducrohet
d13d440d43 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
2009-10-02 12:35:10 -07:00
Raphael
ef1337876b SDK: Fix CustomLocale to properly setup Language+Country
SDK BUG 2154263

Change-Id: I74db5bc237921ff6a6fd55664a2a3c62f544081b
2009-10-02 11:18:10 -07:00
Jeff Sharkey
480332f6c5 Revise template to match spec per jham. 2009-10-01 22:14:45 -07:00
David 'Digit' Turner
cc230ba07c Ensure the version of 'awk' detected by host-setup.sh is used during the build 2009-10-01 21:27:19 -07:00
Android (Google) Code Review
79adc9fc90 Merge change Ia78a7753 into eclair
* changes:
  Remove bash-specific operator from build/host-setup.sh.
2009-10-01 23:26:50 -04:00
Android (Google) Code Review
bfd51eca87 Merge change Id5105cb7
* changes:
  Remove adb networking support.
2009-10-01 21:07:38 -04:00
Elliott Hughes
d5105cb7bd Remove adb networking support.
(Just removing a comment here.)

Bug: 1122968
2009-10-01 17:46:38 -07:00
Xavier Ducrohet
f073703057 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
2009-10-01 17:23:25 -07:00
David 'Digit' Turner
a78a775332 Remove bash-specific operator from build/host-setup.sh. 2009-10-01 16:38:44 -07:00
Raphael
2ace885b29 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
2009-10-01 14:17:02 -07:00
Android (Google) Code Review
657bdd7d28 Merge change I8a575e49 into eclair
* changes:
  Fix CustomLocale to work with soft keyboard.
2009-10-01 16:54:48 -04:00
Xavier Ducrohet
9c99b07f6c am 91175e6f: am 69940e9b: Merge change I77069a1e into eclair
Merge commit '91175e6fdd24e57e297580934963b32cde500fb1'

* commit '91175e6fdd24e57e297580934963b32cde500fb1':
  Replace icon template with new style and multiple densities.
2009-10-01 13:47:48 -07:00
Xavier Ducrohet
b4f73e08e9 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.
2009-10-01 13:46:46 -07:00
Raphael
0bd70bcf5b Fix CustomLocale to work with soft keyboard.
SDK BUG 2154263

Change-Id: I8a575e49089ef2e6829e10749d796f6179330928
2009-10-01 13:28:21 -07:00
Xavier Ducrohet
2cdd16b77f fix the build
Change-Id: Ica519f7e0adbc9fd48792198221c01da3e27fab8
2009-10-01 12:54:02 -07:00
Android (Google) Code Review
1233e408f7 Merge change Ie3124796 into eclair
* changes:
  Ignore adt/eclipse project files in CustomLocale
2009-10-01 15:32:41 -04:00
Xavier Ducrohet
08c3107336 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.
2009-10-01 12:16:44 -07:00
Costin Manolache
40a578fe30 am b0b2714f: am aa3eaa70: Merge change I343737c9 into eclair
Merge commit 'b0b2714ff3ad19ba908c91781e6e3f9cfdf48622'

* commit 'b0b2714ff3ad19ba908c91781e6e3f9cfdf48622':
  Remove GAIA string
2009-10-01 11:50:48 -07:00
Chung-yih Wang
26f313aeeb am 6d74e724: am 84dcb451: Add unit test for new keystore.
Merge commit '6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1'

* commit '6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1':
  Add unit test for new keystore.
2009-10-01 11:48:35 -07:00
Xavier Ducrohet
57e3fc9de2 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)
2009-10-01 11:46:45 -07:00
Raphael
837d7a1a03 am 4db669b9: am 603899e5: Merge change I95a34d28 into eclair
Merge commit '4db669b91e576c9eaeb8e44af594953f85de3788'

* commit '4db669b91e576c9eaeb8e44af594953f85de3788':
  ADT XML String Refactoring: fix refusing to edit @+id/blah.
2009-10-01 11:46:41 -07:00
Xavier Ducrohet
88f6ea9835 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)
2009-10-01 11:46:36 -07:00
Daniel Sandler
26d17bc870 am b4e1e2e2: am 6f53211d: Merge change Ie022d478 into eclair
Merge commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9'

* commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9':
  hdpi artwork for development/{apps,samples}.
2009-10-01 11:44:06 -07:00
Xavier Ducrohet
4e9aab460f am c41c521c: am fa4fb905: Merge change I96ff4429 into eclair
Merge commit 'c41c521cf324562a01c3939da2ed128d3772e332'

* commit 'c41c521cf324562a01c3939da2ed128d3772e332':
  Add support for 'android update test-project'.
2009-10-01 11:42:17 -07:00
Brett Chabot
c6ee4b844c am 8bc47e6e: am 7571d11b: Merge change I2cdb052a into eclair
Merge commit '8bc47e6e3da18df72110630eb6fdde82caa7d30d'

* commit '8bc47e6e3da18df72110630eb6fdde82caa7d30d':
  Import testrunner changes from puppetmaster to keep them in sync.
2009-10-01 11:40:17 -07:00
Raphael
4a062018fd Ignore adt/eclipse project files in CustomLocale
SDK BUG 2154263

Change-Id: Ie31247964058f8140f2bd5184a8b7deac4ad0381
2009-10-01 11:40:13 -07:00
Omari Stephens
7da81d950c am 855489d1: am e377fa60: Merge change I17a9df5a into eclair
Merge commit '855489d1f98d7dd19e49acfc6b6c2d186334e998'

* commit '855489d1f98d7dd19e49acfc6b6c2d186334e998':
  Add contacts tests to the continuous test cycle
2009-10-01 11:40:12 -07:00
Raphael
27de6db35b am e73b8485: am 5ea7700f: Merge change Id5af7cf2 into eclair
Merge commit 'e73b8485a926ba1b4ec438b57e89c9c84200945a'

* commit 'e73b8485a926ba1b4ec438b57e89c9c84200945a':
  Add xdpi and ydpi to layout-configs XML Schema.
2009-10-01 11:38:34 -07:00
David 'Digit' Turner
6b7ed58b8b 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.
2009-10-01 11:37:53 -07:00
Xavier Ducrohet
2b601c2853 am 0287e8dc: am 1028accb: Merge change Ic86de6e9 into eclair
Merge commit '0287e8dc7605bb12f8e5fa9403414b034eb5ae19'

* commit '0287e8dc7605bb12f8e5fa9403414b034eb5ae19':
  Fix NPE when opening new layout file.
2009-10-01 11:14:45 -07:00
Dianne Hackborn
ad77c03f3e am f93f4d9c: am 5bc6141c: Add development setting for compatibility mode.
Merge commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b'

* commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b':
  Add development setting for compatibility mode.
2009-10-01 11:11:06 -07:00
Xavier Ducrohet
227b8768fa Load default GLE device profiles from the SDK.
Change-Id: Ife64397692912f892ec81af8237ac31914830be9
2009-09-30 23:01:19 -07:00
Xavier Ducrohet
91175e6fdd 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.
2009-09-30 21:32:17 -07:00
Android (Google) Code Review
69940e9bab Merge change I77069a1e into eclair
* changes:
  Replace icon template with new style and multiple densities.
2009-10-01 00:23:41 -04:00
Xavier Ducrohet
739c75d4fa 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.
2009-09-30 21:17:05 -07:00
Xavier Ducrohet
8677a1704e 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
2009-09-30 20:46:00 -07:00