Commit Graph

12088 Commits

Author SHA1 Message Date
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
mike ritter
82034fdf17 Remove unnecessary preprocessing of monkey commands, fix bug where it didn't recognize '@', '+', '.', etc.
Bug #2121341
2009-09-27 12:17:26 -07: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
Xavier Ducrohet
007aece284 am f519910b: Merge change 26983 into eclair
Merge commit 'f519910b5624f7d7d7a16db482bc205c1b548837' into eclair-plus-aosp

* commit 'f519910b5624f7d7d7a16db482bc205c1b548837':
  Fix colSpan for screenshot display from 3 to 4 in DDMS.
2009-09-25 10:59:40 -07:00
Xavier Ducrohet
70f5f03e62 am e223b7b3: am 61676a40: Merge change 26540 into eclair
Merge commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563'

* commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563':
  Make the Density enum use the int value from the api Density enum.
2009-09-25 10:58:59 -07:00
Xavier Ducrohet
391b1a52b4 am 9dac83d6: am 00652320: Merge change 26751 into eclair
Merge commit '9dac83d6109531da86ce22389a5465dfc6d70a8c'

* commit '9dac83d6109531da86ce22389a5465dfc6d70a8c':
  Hide APK split UI (not ready yet)
2009-09-25 10:58:30 -07:00
Piotr Gurgul
aa459697d1 am c0109500: am 5b6f3cbe: Add --no-locals to dx when dexing instrumented classes
Merge commit 'c01095003cd3232323b191adeaa9093c4940cc42'

* commit 'c01095003cd3232323b191adeaa9093c4940cc42':
  Add --no-locals to dx when dexing instrumented classes
2009-09-25 10:56:50 -07:00
Piotr Gurgul
5b47911df6 am 284e84b6: am 95a32505: Merge change 26649 into eclair
Merge commit '284e84b677f0e8588bf5d3ebc44b615d922b493f'

* commit '284e84b677f0e8588bf5d3ebc44b615d922b493f':
  Define tested.project.dir property for existing samples
2009-09-25 10:54:06 -07:00
Brett Chabot
b6f7e7c84e am 51d9d2df: am 9f7ae08e: Add cts-media test definition in eclair.
Merge commit '51d9d2dff3c6f28aeb3610749eda105ae688a9d7'

* commit '51d9d2dff3c6f28aeb3610749eda105ae688a9d7':
  Add cts-media test definition in eclair.
2009-09-25 10:50:49 -07:00
Android (Google) Code Review
f519910b56 Merge change 26983 into eclair
* changes:
  Fix colSpan for screenshot display from 3 to 4 in DDMS.
2009-09-25 13:49:47 -04:00
Marco Nelissen
5fdfb55129 am 1d448a8f: am 265513f5: Merge change 26604 into eclair
Merge commit '1d448a8f83f78cf48449bb806861224160ff85f9'

* commit '1d448a8f83f78cf48449bb806861224160ff85f9':
  Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
2009-09-25 08:51:27 -07:00
Xavier Ducrohet
9cd9d69f8a am 6ef34c54: am 68cc2b00: Merge change 26490 into eclair
Merge commit '6ef34c54db7e39817efa06c76865c937b79b3630'

* commit '6ef34c54db7e39817efa06c76865c937b79b3630':
  Fix possible NPE in DDMS plugin init.
2009-09-25 08:51:23 -07:00
Xavier Ducrohet
89c98869bd am 68c32ee4: am d582592e: Merge change 26495 into eclair
Merge commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd'

* commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd':
  Disable menu items based on device/app selection.
2009-09-25 08:47:35 -07:00
Xavier Ducrohet
1c349c6970 am 7b26a0e0: am c733a529: Merge change 26521 into eclair
Merge commit '7b26a0e06634347011a357b22234a700ea4cf854'

* commit '7b26a0e06634347011a357b22234a700ea4cf854':
  Force update to the next plugin.
2009-09-25 08:47:31 -07:00
Xavier Ducrohet
87490c270c am 7856a59e: am 350187ab: Create Density based resource values when needed.
Merge commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6'

* commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6':
  Create Density based resource values when needed.
2009-09-25 08:47:17 -07:00
Xavier Ducrohet
bb32d2fe52 am 154bc29a: am 038300d9: Merge change 26471 into eclair
Merge commit '154bc29a03771667c39457e2476df30ee55eda56'

* commit '154bc29a03771667c39457e2476df30ee55eda56':
  Fix the qualifier match algorithm.
2009-09-25 08:46:59 -07:00
Piotr Gurgul
ad6cb0043a am d3868d38: am fa0062da: Add legacy support for application.package property
Merge commit 'd3868d38033cd94a826a47852a8164c9b87ea2a6'

* commit 'd3868d38033cd94a826a47852a8164c9b87ea2a6':
  Add legacy support for application.package property
2009-09-25 08:44:22 -07:00
Piotr Gurgul
dd38dd51a6 Add info about location of the coverage report
Target 'coverage' outputs now path to the generated coverage report.

Change-Id: I442c0ff002c5d269cf1f573674105691df9caec5
2009-09-24 21:37:00 -07:00
Raphael
4c49f4e36c am bf95b308: Merge change 26996 into eclair
Merge commit 'bf95b3085438418b876ec5fb0ba0349c5fc133c0' into eclair-plus-aosp

* commit 'bf95b3085438418b876ec5fb0ba0349c5fc133c0':
  JarUtils: Ignore visual source safe files in resources
2009-09-24 20:43:12 -07:00