Commit Graph

2328 Commits

Author SHA1 Message Date
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
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
Brett Chabot
8bc47e6e3d 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.
2009-09-29 15:38:35 -07:00
Omari Stephens
855489d1f9 am e377fa60: Merge change I17a9df5a into eclair
Merge commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f' into eclair-plus-aosp

* commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f':
  Add contacts tests to the continuous test cycle
2009-09-29 15:38:31 -07:00
Android (Google) Code Review
7571d11b70 Merge change I2cdb052a into eclair
* changes:
  Import testrunner changes from puppetmaster to keep them in sync.
2009-09-29 18:35:53 -04:00
Brett Chabot
1d9928aaf7 Import testrunner changes from puppetmaster to keep them in sync. 2009-09-29 15:34:20 -07:00
Android (Google) Code Review
e377fa60d1 Merge change I17a9df5a into eclair
* changes:
  Add contacts tests to the continuous test cycle
2009-09-29 18:30:34 -04:00
Raphael
e73b8485a9 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.
2009-09-29 15:13:11 -07:00
Android (Google) Code Review
5ea7700ffa Merge change Id5af7cf2 into eclair
* changes:
  Add xdpi and ydpi to layout-configs XML Schema.
2009-09-29 18:05:10 -04:00
Raphael
9b8a8056d1 Add xdpi and ydpi to layout-configs XML Schema.
Also validate that whitespace around tokens is accepted.

BUG 2138329

Change-Id: Id5af7cf2b0689f05327a0cf0b17a525ceba78a12
2009-09-29 14:41:45 -07:00
David 'Digit' Turner
0f4c48a4c7 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.
2009-09-29 14:37:58 -07:00
David 'Digit' Turner
b6d2a4990a 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.
2009-09-29 14:28:08 -07:00
Omari Stephens
17a9df5a1d Add contacts tests to the continuous test cycle 2009-09-29 14:17:34 -07:00
David 'Digit' Turner
3c8d2e272b Fix the skins to do proper dpad rotation in landscape mode. 2009-09-29 13:19:40 -07:00
Jean-Michel Trivi
481fc7807a 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.
2009-09-29 11:10:58 -07:00
Xavier Ducrohet
4adb47c83b 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
2009-09-29 11:09:45 -07:00
Xavier Ducrohet
e0f44e7dbe am 064380b1: am 7d762002: Merge change I097b444e into eclair
Merge commit '064380b1edb326a6feb9d26b28bd590304eb1d7d'

* commit '064380b1edb326a6feb9d26b28bd590304eb1d7d':
  Fix ApiDemo Layout rendering test
2009-09-29 11:08:41 -07:00
Xavier Ducrohet
4caec81666 am 8f608886: am eafb009b: Merge change I663d4cb7 into eclair
Merge commit '8f60888662e3728c16415aabb75d869757cf5639'

* commit '8f60888662e3728c16415aabb75d869757cf5639':
  Update the project creation (from the command line):
2009-09-29 11:07:47 -07:00
Xavier Ducrohet
41552a06bf am 947561b3: am c124b2ab: Merge change Ib1b01007 into eclair
Merge commit '947561b337e35d7645f4efdb238fbc6f8281b3d5'

* commit '947561b337e35d7645f4efdb238fbc6f8281b3d5':
  Parse add-on supplied layout devices.
2009-09-29 11:07:43 -07:00
David 'Digit' Turner
60f1b901a6 am 51c5bc22: am fce2633d: Merge change I1dbeeca5 into eclair
Merge commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f'

* commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f':
  Fix NDK usage of libgcc.a when building shared libraries
2009-09-29 11:06:55 -07:00
Xavier Ducrohet
147d538482 am 708c5b4f: am e6ca35d4: Fix ResourceQualifier tests.
Merge commit '708c5b4fa4384b032984031e439a2edd7ba0d7d9'

* commit '708c5b4fa4384b032984031e439a2edd7ba0d7d9':
  Fix ResourceQualifier tests.
2009-09-29 11:06:28 -07:00
Xavier Ducrohet
0287e8dc76 am 1028accb: Merge change Ic86de6e9 into eclair
Merge commit '1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp

* commit '1028accb55919c0a84a4871002efb19a202c475c':
  Fix NPE when opening new layout file.
2009-09-29 10:18:55 -07:00
Android (Google) Code Review
1028accb55 Merge change Ic86de6e9 into eclair
* changes:
  Fix NPE when opening new layout file.
2009-09-29 13:09:41 -04:00
Dianne Hackborn
f93f4d9c8b am 5bc6141c: Add development setting for compatibility mode.
Merge commit '5bc6141cb29913d344b4a7881956af8b5074f560' into eclair-plus-aosp

* commit '5bc6141cb29913d344b4a7881956af8b5074f560':
  Add development setting for compatibility mode.
2009-09-29 00:15:28 -07:00
Dianne Hackborn
5bc6141cb2 Add development setting for compatibility mode.
Also some cleanup here and there.

Change-Id: Iebf563cf6ec2d0b1671a54bd534336e8fef4b9c0
2009-09-29 00:03:59 -07:00
Xavier Ducrohet
596f3b8d91 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
2009-09-28 17:59:25 -07:00
Jean-Michel Trivi
2296cfbd37 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.
2009-09-28 15:23:31 -07:00
Android (Google) Code Review
8c77415ede 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.
2009-09-28 18:14:51 -04:00
Jean-Michel Trivi
c94b435b86 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.
2009-09-28 15:06:25 -07:00
Xavier Ducrohet
ebe66dfea9 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
2009-09-28 14:41:39 -07:00
Xavier Ducrohet
9e4715e6d9 Fix ADT to use the new sdklib API
ManifestConstants got renamed AndroidManifest but I
forgot to update ADT.

Change-Id: I60d40c63a67968c31789e91f14020c61114907ca
2009-09-28 14:32:34 -07:00
Xavier Ducrohet
064380b1ed am 7d762002: Merge change I097b444e into eclair
Merge commit '7d76200234bace44816f6328d2327ffb9d9c0a18' into eclair-plus-aosp

* commit '7d76200234bace44816f6328d2327ffb9d9c0a18':
  Fix ApiDemo Layout rendering test
2009-09-28 14:00:18 -07:00
Android (Google) Code Review
7d76200234 Merge change I097b444e into eclair
* changes:
  Fix ApiDemo Layout rendering test
2009-09-28 16:49:09 -04:00
Xavier Ducrohet
8d33f4a821 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
2009-09-28 13:47:49 -07:00
Xavier Ducrohet
8f60888662 am eafb009b: Merge change I663d4cb7 into eclair
Merge commit 'eafb009baf48c876fa22409f862523966293d4d8' into eclair-plus-aosp

* commit 'eafb009baf48c876fa22409f862523966293d4d8':
  Update the project creation (from the command line):
2009-09-28 13:40:06 -07:00
Xavier Ducrohet
947561b337 am c124b2ab: Merge change Ib1b01007 into eclair
Merge commit 'c124b2ab7bb228a3363535c6697708a82016ce70' into eclair-plus-aosp

* commit 'c124b2ab7bb228a3363535c6697708a82016ce70':
  Parse add-on supplied layout devices.
2009-09-28 13:40:02 -07:00
Android (Google) Code Review
eafb009baf Merge change I663d4cb7 into eclair
* changes:
  Update the project creation (from the command line):
2009-09-28 16:33:57 -04:00
Android (Google) Code Review
c124b2ab7b Merge change Ib1b01007 into eclair
* changes:
  Parse add-on supplied layout devices.
2009-09-28 16:29:25 -04:00
David 'Digit' Turner
51c5bc22be 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
2009-09-28 13:03:49 -07:00
Android (Google) Code Review
fce2633d14 Merge change I1dbeeca5 into eclair
* changes:
  Fix NDK usage of libgcc.a when building shared libraries
2009-09-28 15:53:19 -04:00
Xavier Ducrohet
708c5b4fa4 am e6ca35d4: Fix ResourceQualifier tests.
Merge commit 'e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689' into eclair-plus-aosp

* commit 'e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689':
  Fix ResourceQualifier tests.
2009-09-28 12:33:55 -07:00
Xavier Ducrohet
e6ca35d4b0 Fix ResourceQualifier tests.
Change-Id: Ib6109c1bb76dadddeef24aec3af16e178a931651
2009-09-28 12:16:16 -07:00
David 'Digit' Turner
1dbeeca5c4 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.
2009-09-28 10:41:32 -07:00
Raphael
6231d9e12b am 3c1dc23c: am 3a683661: Merge change 27217 into eclair
Merge commit '3c1dc23c464eb1ab3f2642227bcc54577de83aca'

* commit '3c1dc23c464eb1ab3f2642227bcc54577de83aca':
  XML Schema for layout configurations.
2009-09-28 10:02:37 -07:00
Nicolas Catania
77136ea736 am 0bb8ca45: am 31727ecb: Merge change 27167 into eclair
Merge commit '0bb8ca45303d5cf6004ede4d0a2aa225ab746fec'

* commit '0bb8ca45303d5cf6004ede4d0a2aa225ab746fec':
  Added a target to run the Contacts tests using runtest.
2009-09-28 01:13:46 -07:00
Xavier Ducrohet
98b9c10e63 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
2009-09-27 21:54:09 -07:00