Commit Graph

1024 Commits

Author SHA1 Message Date
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
c124b2ab7b Merge change Ib1b01007 into eclair
* changes:
  Parse add-on supplied layout devices.
2009-09-28 16:29:25 -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
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
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
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
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
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
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
Android (Google) Code Review
bf95b30854 Merge change 26996 into eclair
* changes:
  JarUtils: Ignore visual source safe files in resources
2009-09-24 23:33:56 -04:00
Raphael
fbdd134b92 JarUtils: Ignore visual source safe files in resources
BUG 1895888

Change-Id: I75af6ef9ba22701fae9e4c2b08f11b8a8c2aaaa6
2009-09-24 19:56:39 -07:00
Xavier Ducrohet
aa1939f868 Fix colSpan for screenshot display from 3 to 4 in DDMS.
Change-Id: I4cf92b2f6ee66cd6f8e9b224879d8459e82949b6
2009-09-24 19:13:26 -07:00
Piotr Gurgul
6f7e418083 am 09f517d4: Merge change 26976 into eclair
Merge commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e' into eclair-plus-aosp

* commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e':
  Add tested.project.dir to classpath for install and debug
2009-09-24 18:45:47 -07:00
Android (Google) Code Review
09f517d43e Merge change 26976 into eclair
* changes:
  Add tested.project.dir to classpath for install and debug
2009-09-24 21:35:55 -04:00
Piotr Gurgul
bca3ef5c25 Add tested.project.dir to classpath for install and debug
Now buildfile recognizes whether targets 'debug' or 'install' are being run for
an ordinary or test project and for the test projects classpath is extended
to enclose the tested project. Tested project is being compiled if necessary.
2009-09-24 18:17:22 -07:00
Xavier Ducrohet
f0581300ba am 14ecfe10: Merge change 26915 into eclair
Merge commit '14ecfe10515807d57ba110671b760024cc5d1af8' into eclair-plus-aosp

* commit '14ecfe10515807d57ba110671b760024cc5d1af8':
  Fixed screenshot command line tool to deal with new RawImage
2009-09-24 16:49:31 -07:00
Xavier Ducrohet
eef2447cfd Fixed screenshot command line tool to deal with new RawImage
Also added a rotate method to DDMS.

Change-Id: I9ec2774ff0679b8b4f044341470b3dfa527f9680
2009-09-24 14:49:49 -07:00
Xavier Ducrohet
07c5b18f76 am f9e2be14: Merge change 26901 into eclair
Merge commit 'f9e2be14764832f81a90f1f03ca9460be05191b3' into eclair-plus-aosp

* commit 'f9e2be14764832f81a90f1f03ca9460be05191b3':
  Move the screenshot button above the image
2009-09-24 14:16:37 -07:00
Xavier Ducrohet
3d2fbef573 am 5eff9966: Merge change 26893 into eclair
Merge commit '5eff99663c35031975b33e25ab74e2a710231c0a' into eclair-plus-aosp

* commit '5eff99663c35031975b33e25ab74e2a710231c0a':
  Make archquery use the same VM as DDMS/Traceview
2009-09-24 14:16:32 -07:00
Android (Google) Code Review
f9e2be1476 Merge change 26901 into eclair
* changes:
  Move the screenshot button above the image
2009-09-24 17:09:28 -04:00
Android (Google) Code Review
5eff99663c Merge change 26893 into eclair
* changes:
  Make archquery use the same VM as DDMS/Traceview
2009-09-24 17:09:23 -04:00
Xavier Ducrohet
5ec5c213a9 Move the screenshot button above the image
This will help when taking screenshots of large screen devices
on laptop screens.

Change-Id: Ief7b03d2f1711970e76f4dfe6086e3ea0d606c99
2009-09-24 13:20:42 -07:00
Xavier Ducrohet
f92c16e287 Make archquery use the same VM as DDMS/Traceview
archquery is used to figure out whether the VM is 32 or 64 bit, but on
MacOS X, it used the normal "java" command while the application was
forced to use java 1.5

This could lead to cases where archquery ran in 1.6 64bit but the app
in 1.5 32 bit, creating a mismatch and make the app using the wrong
SWT version.
2009-09-24 12:27:37 -07:00
Xavier Ducrohet
07324ef191 am b936faf6: Merge change 26773 into eclair
Merge commit 'b936faf6e6a3e10408f257f948241cf984d7652a' into eclair-plus-aosp

* commit 'b936faf6e6a3e10408f257f948241cf984d7652a':
  Disable clipping toggle when not supported.
2009-09-23 23:42:31 -07:00
Xavier Ducrohet
df254a6a3a am b9b29878: Merge change 26740 into eclair
Merge commit 'b9b298782a9d33085e6df5d1d7c588178b4fb07a' into eclair-plus-aosp

* commit 'b9b298782a9d33085e6df5d1d7c588178b4fb07a':
  Add warning on mismatch minSdkVersion.
2009-09-23 23:42:26 -07:00
Android (Google) Code Review
b936faf6e6 Merge change 26773 into eclair
* changes:
  Disable clipping toggle when not supported.
2009-09-24 02:35:11 -04:00
Android (Google) Code Review
b9b298782a Merge change 26740 into eclair
* changes:
  Add warning on mismatch minSdkVersion.
2009-09-24 02:34:55 -04:00
Xavier Ducrohet
e223b7b371 am 61676a40: Merge change 26540 into eclair
Merge commit '61676a4061ef0400baa0c75c44a06bf740a55dc6' into eclair-plus-aosp

* commit '61676a4061ef0400baa0c75c44a06bf740a55dc6':
  Make the Density enum use the int value from the api Density enum.
2009-09-23 20:42:28 -07:00
Xavier Ducrohet
0d3e110b36 Disable clipping toggle when not supported.
This is only supported in Eclair+, so the toggle button
is disable if the edited file is donut or before.

Change-Id: I8bf1f8a8aa3604f269cb226d788c5e1438a5ae0b
2009-09-23 20:40:36 -07:00
Xavier Ducrohet
d0306ecd58 Add warning on mismatch minSdkVersion.
This is for both Ant and ADT.
For Ant, also added a check for non-integer values when the platform
is not a preview.

BUG:2118374

Change-Id: Ic8ec533d66a31d9e4b51c9c38b5eaab97bca7414
2009-09-23 20:38:33 -07:00
Android (Google) Code Review
61676a4061 Merge change 26540 into eclair
* changes:
  Make the Density enum use the int value from the api Density enum.
2009-09-23 23:34:38 -04:00
Xavier Ducrohet
9dac83d610 am 00652320: Merge change 26751 into eclair
Merge commit '006523204335a8c18ab57dbcd34a81a95a11d31f' into eclair-plus-aosp

* commit '006523204335a8c18ab57dbcd34a81a95a11d31f':
  Hide APK split UI (not ready yet)
2009-09-23 19:57:43 -07:00
Android (Google) Code Review
0065232043 Merge change 26751 into eclair
* changes:
  Hide APK split UI (not ready yet)
2009-09-23 22:49:47 -04:00
Piotr Gurgul
c01095003c am 5b6f3cbe: Add --no-locals to dx when dexing instrumented classes
Merge commit '5b6f3cbe4b88a98262a8b30b546543b8394e1f67' into eclair-plus-aosp

* commit '5b6f3cbe4b88a98262a8b30b546543b8394e1f67':
  Add --no-locals to dx when dexing instrumented classes
2009-09-23 18:34:29 -07:00
Xavier Ducrohet
019685753e Hide APK split UI (not ready yet)
Change-Id: I2ace823139710e836c72cc323427024b54384e38
2009-09-23 18:22:49 -07:00
Piotr Gurgul
5b6f3cbe4b Add --no-locals to dx when dexing instrumented classes
Emma instrumentation modifies .class files in that way they cannot be processed
by dx without --no-locals option.
2009-09-23 18:20:25 -07:00
Xavier Ducrohet
252ad3146a Make the Density enum use the int value from the api Density enum.
Change-Id: I13cace9a3fd7d17171ebe1e8b98c31adfa8509dc
2009-09-23 15:11:32 -07:00
Xavier Ducrohet
6ef34c54db am 68cc2b00: Merge change 26490 into eclair
Merge commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc' into eclair-plus-aosp

* commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc':
  Fix possible NPE in DDMS plugin init.
2009-09-23 10:44:19 -07:00
Android (Google) Code Review
68cc2b0084 Merge change 26490 into eclair
* changes:
  Fix possible NPE in DDMS plugin init.
2009-09-23 13:33:35 -04:00
Xavier Ducrohet
c29e58952e Fix possible NPE in DDMS plugin init.
Change-Id: Ie1649b319948514473e11c27b4ad126ffe2d40ef
2009-09-22 20:37:24 -07:00
Xavier Ducrohet
68c32ee43e am d582592e: Merge change 26495 into eclair
Merge commit 'd582592ea58188ad3b43523326dda5f9ae2669c7' into eclair-plus-aosp

* commit 'd582592ea58188ad3b43523326dda5f9ae2669c7':
  Disable menu items based on device/app selection.
2009-09-22 20:35:07 -07:00
Xavier Ducrohet
7b26a0e066 am c733a529: Merge change 26521 into eclair
Merge commit 'c733a52949c8f98e57ca360cb421f480487ff774' into eclair-plus-aosp

* commit 'c733a52949c8f98e57ca360cb421f480487ff774':
  Force update to the next plugin.
2009-09-22 20:35:03 -07:00
Android (Google) Code Review
d582592ea5 Merge change 26495 into eclair
* changes:
  Disable menu items based on device/app selection.
2009-09-22 23:24:32 -04:00