Merge commit 'cc004309b4905d8b8c86d97d74b92ff0d78c0323' into eclair-plus-aosp
* commit 'cc004309b4905d8b8c86d97d74b92ff0d78c0323':
Add a copy button to the screenshot dialog.
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
Merge commit '363c023be195d943859d3dfc775a453b6791ae4b' into eclair-plus-aosp
* commit '363c023be195d943859d3dfc775a453b6791ae4b':
Add support for xdpi and ydpi in the device config for the GLE.
Merge commit '84dcb451c210d6e93f5f516c27b781c067544895' into eclair-plus-aosp
* commit '84dcb451c210d6e93f5f516c27b781c067544895':
Add unit test for new keystore.
Merge commit '3b5cbc5472c96deb80d90fde815bff486fd82cba' into eclair-plus-aosp
* commit '3b5cbc5472c96deb80d90fde815bff486fd82cba':
Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp
* commit '1fed48849dcadedb68211c5d55c1b452d05b98bc':
Move to 1.6_r2 (DO NOT MERGE)
Merge commit 'fff9ff696709e17ad73ae654e511907282bfc0fd' into eclair
* commit 'fff9ff696709e17ad73ae654e511907282bfc0fd':
Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit 'fa4fb905877d879f2a593e0726108784f204dc5d' into eclair-plus-aosp
* commit 'fa4fb905877d879f2a593e0726108784f204dc5d':
Add support for 'android update test-project'.
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
Merge commit '7571d11b7016b4dada3ad4db218c7d29214a13ba' into eclair-plus-aosp
* commit '7571d11b7016b4dada3ad4db218c7d29214a13ba':
Import testrunner changes from puppetmaster to keep them in sync.
Merge commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f' into eclair-plus-aosp
* commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f':
Add contacts tests to the continuous test cycle
Merge commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c' into eclair-plus-aosp
* commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c':
Add xdpi and ydpi to layout-configs XML Schema.
Merge commit 'b6d2a4990a21b78355ff95d62fd698b1dddbd793' into eclair-plus-aosp
* commit 'b6d2a4990a21b78355ff95d62fd698b1dddbd793':
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.
Merge commit '1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp
* commit '1028accb55919c0a84a4871002efb19a202c475c':
Fix NPE when opening new layout file.
Merge commit '5bc6141cb29913d344b4a7881956af8b5074f560' into eclair-plus-aosp
* commit '5bc6141cb29913d344b4a7881956af8b5074f560':
Add development setting for compatibility mode.
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
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
Merge commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87' into eclair-plus-aosp
* commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87':
Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
* 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.
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.
Merge commit '9e4715e6d94e300605ab845c2e68bddaf8c23c8f' into eclair-plus-aosp
* commit '9e4715e6d94e300605ab845c2e68bddaf8c23c8f':
Fix ADT to use the new sdklib API
