Commit Graph

2501 Commits

Author SHA1 Message Date
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
Xavier Ducrohet
cc02b85ba6 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
2009-09-28 16:30:13 -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
Xavier Ducrohet
c51d184216 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
2009-09-27 18:08:00 -07:00
Raphael
3c1dc23c46 am 3a683661: Merge change 27217 into eclair
Merge commit '3a683661975908a9bfe2ef4ae5097a8d4ad75b53' into eclair-plus-aosp

* commit '3a683661975908a9bfe2ef4ae5097a8d4ad75b53':
  XML Schema for layout configurations.
2009-09-27 17:32:17 -07:00
Android (Google) Code Review
3a68366197 Merge change 27217 into eclair
* changes:
  XML Schema for layout configurations.
2009-09-27 20:22:59 -04:00
Raphael
48f27946d5 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
2009-09-27 16:44:45 -07:00
Dianne Hackborn
e78ac99cc0 am 83f37133: am bad9ac7f: Merge change 27163 into eclair
Merge commit '83f3713356c2669ed839e5521ff772c18746c856'

* commit '83f3713356c2669ed839e5521ff772c18746c856':
  Add transition animation sample, log to service sample.
2009-09-27 15:41:44 -07:00
Xavier Ducrohet
0389a82c8b am c69e4510: am 0f61aa64: Sync DDMS/Traceview/Android version on the repository source.
Merge commit 'c69e451084b96d94a368f9cba0a5f7104b7272ec'

* commit 'c69e451084b96d94a368f9cba0a5f7104b7272ec':
  Sync DDMS/Traceview/Android version on the repository source.
2009-09-27 15:40:43 -07:00
Piotr Gurgul
d96e361f8a am bcf2eea5: am 4af6620a: Merge change 26982 into eclair
Merge commit 'bcf2eea5bac62c8a43c1126fcca839ee31d9dee7'

* commit 'bcf2eea5bac62c8a43c1126fcca839ee31d9dee7':
  Add info about location of the coverage report
2009-09-27 15:36:46 -07:00
Nicolas Catania
0bb8ca4530 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.
2009-09-27 14:08:14 -07:00
Android (Google) Code Review
31727ecbd9 Merge change 27167 into eclair
* changes:
  Added a target to run the Contacts tests using runtest.
2009-09-27 16:56:53 -04:00
Nicolas Catania
f8f452c52d Added a target to run the Contacts tests using runtest. 2009-09-25 16:30:09 -07:00
Dianne Hackborn
83f3713356 am bad9ac7f: Merge change 27163 into eclair
Merge commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8' into eclair-plus-aosp

* commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8':
  Add transition animation sample, log to service sample.
2009-09-25 16:20:56 -07:00
Android (Google) Code Review
bad9ac7f37 Merge change 27163 into eclair
* changes:
  Add transition animation sample, log to service sample.
2009-09-25 19:12:39 -04:00
Dianne Hackborn
cfc90dc1aa Add transition animation sample, log to service sample.
Change-Id: I7021a7fbbe26d9c52699d7c2216452a5bd51452b
2009-09-25 16:10:42 -07:00
Xavier Ducrohet
c69e451084 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.
2009-09-25 15:50:34 -07:00
Xavier Ducrohet
0f61aa6470 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
2009-09-25 15:18:37 -07:00
Piotr Gurgul
bcf2eea5ba am 4af6620a: Merge change 26982 into eclair
Merge commit '4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b' into eclair-plus-aosp

* commit '4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b':
  Add info about location of the coverage report
2009-09-25 13:00:25 -07:00
Android (Google) Code Review
4af6620aa0 Merge change 26982 into eclair
* changes:
  Add info about location of the coverage report
2009-09-25 15:49:48 -04:00
Xavier Ducrohet
449cfd93b5 am 007aece2: am f519910b: Merge change 26983 into eclair
Merge commit '007aece2843d42eb04aba591f35dd106af40e04c'

* commit '007aece2843d42eb04aba591f35dd106af40e04c':
  Fix colSpan for screenshot display from 3 to 4 in DDMS.
2009-09-25 11:27:20 -07:00
Raphael
52169d925c am 4c49f4e3: am bf95b308: Merge change 26996 into eclair
Merge commit '4c49f4e36c555987d3f6dcf0f7ecfda8ae893282'

* commit '4c49f4e36c555987d3f6dcf0f7ecfda8ae893282':
  JarUtils: Ignore visual source safe files in resources
2009-09-25 11:17:13 -07:00
Piotr Gurgul
6cb3fbc5a5 am 6f7e4180: am 09f517d4: Merge change 26976 into eclair
Merge commit '6f7e4180833abd1a20fd6f39b32312aa2001075b'

* commit '6f7e4180833abd1a20fd6f39b32312aa2001075b':
  Add tested.project.dir to classpath for install and debug
2009-09-25 11:15:44 -07:00
Xavier Ducrohet
7d610f7860 am f0581300: am 14ecfe10: Merge change 26915 into eclair
Merge commit 'f0581300ba2ae450bb03452d09b1fedfb4c9b7b2'

* commit 'f0581300ba2ae450bb03452d09b1fedfb4c9b7b2':
  Fixed screenshot command line tool to deal with new RawImage
2009-09-25 11:14:18 -07:00
Brett Chabot
acced8e2f2 am 80d7bbd3: am 7d223329: Merge change 26741 into eclair
Merge commit '80d7bbd3054846238654f8e0dc7cfa9901e99417'

* commit '80d7bbd3054846238654f8e0dc7cfa9901e99417':
  Add workaround to runtest to build cts dependencies.
2009-09-25 11:13:31 -07:00
Raphael
e9917eb019 am 3776994c: am a5115b64: Merge change 26885 into eclair
Merge commit '3776994ce00c8f2423a7eb94641fb7c8a025a331'

* commit '3776994ce00c8f2423a7eb94641fb7c8a025a331':
  Tell the SDK that ApiDemoes requires Eclair preview.
2009-09-25 11:13:27 -07:00
Xavier Ducrohet
26ace8eda1 am 07c5b18f: am f9e2be14: Merge change 26901 into eclair
Merge commit '07c5b18f7690417baa370063034425246ba39071'

* commit '07c5b18f7690417baa370063034425246ba39071':
  Move the screenshot button above the image
2009-09-25 11:11:05 -07:00
Xavier Ducrohet
de7c0643cb am 3d2fbef5: am 5eff9966: Merge change 26893 into eclair
Merge commit '3d2fbef573fca6ae45937ae68fdcffdce5b92e59'

* commit '3d2fbef573fca6ae45937ae68fdcffdce5b92e59':
  Make archquery use the same VM as DDMS/Traceview
2009-09-25 11:11:01 -07:00
Xavier Ducrohet
bde6650fe1 am 07324ef1: am b936faf6: Merge change 26773 into eclair
Merge commit '07324ef191c687573dcc071fc5afe915a64d89e1'

* commit '07324ef191c687573dcc071fc5afe915a64d89e1':
  Disable clipping toggle when not supported.
2009-09-25 11:01:40 -07:00
Xavier Ducrohet
08c488e1cd am df254a6a: am b9b29878: Merge change 26740 into eclair
Merge commit 'df254a6a3a031bde29172a0e0288ad25bfc2712b'

* commit 'df254a6a3a031bde29172a0e0288ad25bfc2712b':
  Add warning on mismatch minSdkVersion.
2009-09-25 11:01:36 -07:00