OSDN Git Service
Xavier Ducrohet [Wed, 30 Sep 2009 01:36:07 +0000 (18:36 -0700)]
am
1fed4884: am
559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '
1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp
* commit '
1fed48849dcadedb68211c5d55c1b452d05b98bc':
Move to 1.6_r2 (DO NOT MERGE)
Xavier Ducrohet [Wed, 30 Sep 2009 01:04:57 +0000 (18:04 -0700)]
am
559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '
559f26b0a5e80da467d97d42280c22e5044d7f30' into eclair
* commit '
559f26b0a5e80da467d97d42280c22e5044d7f30':
Move to 1.6_r2 (DO NOT MERGE)
Daniel Sandler [Wed, 30 Sep 2009 01:01:01 +0000 (18:01 -0700)]
am
6f53211d: Merge change Ie022d478 into eclair
Merge commit '
6f53211d6d9095c67107ac72def6d405e33b7fac' into eclair-plus-aosp
* commit '
6f53211d6d9095c67107ac72def6d405e33b7fac':
hdpi artwork for development/{apps,samples}.
Android (Google) Code Review [Wed, 30 Sep 2009 00:51:06 +0000 (20:51 -0400)]
Merge change Ie022d478 into eclair
* changes:
hdpi artwork for development/{apps,samples}.
Daniel Sandler [Tue, 29 Sep 2009 20:30:07 +0000 (16:30 -0400)]
hdpi artwork for development/{apps,samples}.
(drop dated 29-Sep-2009)
Change-Id: Ie022d478ed4eafc641e475dad94f507a6c358595
Xavier Ducrohet [Tue, 29 Sep 2009 23:54:24 +0000 (16:54 -0700)]
am
fa4fb905: Merge change I96ff4429 into eclair
Merge commit '
fa4fb905877d879f2a593e0726108784f204dc5d' into eclair-plus-aosp
* commit '
fa4fb905877d879f2a593e0726108784f204dc5d':
Add support for 'android update test-project'.
Android (Google) Code Review [Tue, 29 Sep 2009 23:46:01 +0000 (19:46 -0400)]
Merge change I96ff4429 into eclair
* changes:
Add support for 'android update test-project'.
Xavier Ducrohet [Tue, 29 Sep 2009 22:42:46 +0000 (15:42 -0700)]
Move to 1.6_r2 (DO NOT MERGE)
Brett Chabot [Tue, 29 Sep 2009 22:38:35 +0000 (15:38 -0700)]
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.
Omari Stephens [Tue, 29 Sep 2009 22:38:31 +0000 (15:38 -0700)]
am
e377fa60: Merge change I17a9df5a into eclair
Merge commit '
e377fa60d19b76a81b245f0e525652cdd22eb95f' into eclair-plus-aosp
* commit '
e377fa60d19b76a81b245f0e525652cdd22eb95f':
Add contacts tests to the continuous test cycle
Android (Google) Code Review [Tue, 29 Sep 2009 22:35:53 +0000 (18:35 -0400)]
Merge change I2cdb052a into eclair
* changes:
Import testrunner changes from puppetmaster to keep them in sync.
Brett Chabot [Tue, 29 Sep 2009 22:14:05 +0000 (15:14 -0700)]
Import testrunner changes from puppetmaster to keep them in sync.
Android (Google) Code Review [Tue, 29 Sep 2009 22:30:34 +0000 (18:30 -0400)]
Merge change I17a9df5a into eclair
* changes:
Add contacts tests to the continuous test cycle
Raphael [Tue, 29 Sep 2009 22:13:11 +0000 (15:13 -0700)]
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.
Android (Google) Code Review [Tue, 29 Sep 2009 22:05:10 +0000 (18:05 -0400)]
Merge change Id5af7cf2 into eclair
* changes:
Add xdpi and ydpi to layout-configs XML Schema.
Raphael [Tue, 29 Sep 2009 19:14:05 +0000 (12:14 -0700)]
Add xdpi and ydpi to layout-configs XML Schema.
Also validate that whitespace around tokens is accepted.
BUG
2138329
Change-Id: Id5af7cf2b0689f05327a0cf0b17a525ceba78a12
David 'Digit' Turner [Tue, 29 Sep 2009 21:37:58 +0000 (14:37 -0700)]
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.
David 'Digit' Turner [Tue, 29 Sep 2009 21:28:08 +0000 (14:28 -0700)]
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.
Omari Stephens [Tue, 29 Sep 2009 21:16:07 +0000 (14:16 -0700)]
Add contacts tests to the continuous test cycle
David 'Digit' Turner [Fri, 18 Sep 2009 00:19:09 +0000 (17:19 -0700)]
Fix the skins to do proper dpad rotation in landscape mode.
Xavier Ducrohet [Tue, 29 Sep 2009 17:18:55 +0000 (10:18 -0700)]
am
1028accb: Merge change Ic86de6e9 into eclair
Merge commit '
1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp
* commit '
1028accb55919c0a84a4871002efb19a202c475c':
Fix NPE when opening new layout file.
Android (Google) Code Review [Tue, 29 Sep 2009 17:09:41 +0000 (13:09 -0400)]
Merge change Ic86de6e9 into eclair
* changes:
Fix NPE when opening new layout file.
Dianne Hackborn [Tue, 29 Sep 2009 07:15:28 +0000 (00:15 -0700)]
am
5bc6141c: Add development setting for compatibility mode.
Merge commit '
5bc6141cb29913d344b4a7881956af8b5074f560' into eclair-plus-aosp
* commit '
5bc6141cb29913d344b4a7881956af8b5074f560':
Add development setting for compatibility mode.
Dianne Hackborn [Tue, 29 Sep 2009 07:03:59 +0000 (00:03 -0700)]
Add development setting for compatibility mode.
Also some cleanup here and there.
Change-Id: Iebf563cf6ec2d0b1671a54bd534336e8fef4b9c0
Xavier Ducrohet [Tue, 29 Sep 2009 00:53:47 +0000 (17:53 -0700)]
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
Xavier Ducrohet [Mon, 28 Sep 2009 23:25:45 +0000 (16:25 -0700)]
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
Jean-Michel Trivi [Mon, 28 Sep 2009 22:23:31 +0000 (15:23 -0700)]
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.
Android (Google) Code Review [Mon, 28 Sep 2009 22:14:51 +0000 (18:14 -0400)]
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.
Jean-Michel Trivi [Mon, 28 Sep 2009 22:06:25 +0000 (15:06 -0700)]
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.
Xavier Ducrohet [Mon, 28 Sep 2009 21:41:39 +0000 (14:41 -0700)]
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
Xavier Ducrohet [Mon, 28 Sep 2009 21:32:34 +0000 (14:32 -0700)]
Fix ADT to use the new sdklib API
ManifestConstants got renamed AndroidManifest but I
forgot to update ADT.
Change-Id: I60d40c63a67968c31789e91f14020c61114907ca
Xavier Ducrohet [Mon, 28 Sep 2009 21:00:18 +0000 (14:00 -0700)]
am
7d762002: Merge change I097b444e into eclair
Merge commit '
7d76200234bace44816f6328d2327ffb9d9c0a18' into eclair-plus-aosp
* commit '
7d76200234bace44816f6328d2327ffb9d9c0a18':
Fix ApiDemo Layout rendering test
Android (Google) Code Review [Mon, 28 Sep 2009 20:49:09 +0000 (16:49 -0400)]
Merge change I097b444e into eclair
* changes:
Fix ApiDemo Layout rendering test
Xavier Ducrohet [Mon, 28 Sep 2009 19:56:34 +0000 (12:56 -0700)]
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
Xavier Ducrohet [Mon, 28 Sep 2009 20:40:06 +0000 (13:40 -0700)]
am
eafb009b: Merge change I663d4cb7 into eclair
Merge commit '
eafb009baf48c876fa22409f862523966293d4d8' into eclair-plus-aosp
* commit '
eafb009baf48c876fa22409f862523966293d4d8':
Update the project creation (from the command line):
Xavier Ducrohet [Mon, 28 Sep 2009 20:40:02 +0000 (13:40 -0700)]
am
c124b2ab: Merge change Ib1b01007 into eclair
Merge commit '
c124b2ab7bb228a3363535c6697708a82016ce70' into eclair-plus-aosp
* commit '
c124b2ab7bb228a3363535c6697708a82016ce70':
Parse add-on supplied layout devices.
Android (Google) Code Review [Mon, 28 Sep 2009 20:33:57 +0000 (16:33 -0400)]
Merge change I663d4cb7 into eclair
* changes:
Update the project creation (from the command line):
Android (Google) Code Review [Mon, 28 Sep 2009 20:29:25 +0000 (16:29 -0400)]
Merge change Ib1b01007 into eclair
* changes:
Parse add-on supplied layout devices.
David 'Digit' Turner [Mon, 28 Sep 2009 20:03:49 +0000 (13:03 -0700)]
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
Android (Google) Code Review [Mon, 28 Sep 2009 19:53:19 +0000 (15:53 -0400)]
Merge change I1dbeeca5 into eclair
* changes:
Fix NDK usage of libgcc.a when building shared libraries
Xavier Ducrohet [Mon, 28 Sep 2009 19:33:55 +0000 (12:33 -0700)]
am
e6ca35d4: Fix ResourceQualifier tests.
Merge commit '
e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689' into eclair-plus-aosp
* commit '
e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689':
Fix ResourceQualifier tests.
Xavier Ducrohet [Mon, 28 Sep 2009 19:16:16 +0000 (12:16 -0700)]
Fix ResourceQualifier tests.
Change-Id: Ib6109c1bb76dadddeef24aec3af16e178a931651
David 'Digit' Turner [Thu, 24 Sep 2009 22:48:44 +0000 (15:48 -0700)]
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.
Xavier Ducrohet [Mon, 28 Sep 2009 04:39:07 +0000 (21:39 -0700)]
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
Xavier Ducrohet [Fri, 25 Sep 2009 22:52:52 +0000 (15:52 -0700)]
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
Raphael [Mon, 28 Sep 2009 00:32:17 +0000 (17:32 -0700)]
am
3a683661: Merge change 27217 into eclair
Merge commit '
3a683661975908a9bfe2ef4ae5097a8d4ad75b53' into eclair-plus-aosp
* commit '
3a683661975908a9bfe2ef4ae5097a8d4ad75b53':
XML Schema for layout configurations.
Android (Google) Code Review [Mon, 28 Sep 2009 00:22:59 +0000 (20:22 -0400)]
Merge change 27217 into eclair
* changes:
XML Schema for layout configurations.
Raphael [Thu, 24 Sep 2009 22:38:55 +0000 (15:38 -0700)]
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
Nicolas Catania [Sun, 27 Sep 2009 21:08:14 +0000 (14:08 -0700)]
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.
Android (Google) Code Review [Sun, 27 Sep 2009 20:56:53 +0000 (16:56 -0400)]
Merge change 27167 into eclair
* changes:
Added a target to run the Contacts tests using runtest.
Nicolas Catania [Fri, 25 Sep 2009 23:30:09 +0000 (16:30 -0700)]
Added a target to run the Contacts tests using runtest.
Dianne Hackborn [Fri, 25 Sep 2009 23:20:56 +0000 (16:20 -0700)]
am
bad9ac7f: Merge change 27163 into eclair
Merge commit '
bad9ac7f373f5585ee6e43926b21c470d07663f8' into eclair-plus-aosp
* commit '
bad9ac7f373f5585ee6e43926b21c470d07663f8':
Add transition animation sample, log to service sample.
Android (Google) Code Review [Fri, 25 Sep 2009 23:12:39 +0000 (19:12 -0400)]
Merge change 27163 into eclair
* changes:
Add transition animation sample, log to service sample.
Dianne Hackborn [Fri, 25 Sep 2009 02:27:54 +0000 (19:27 -0700)]
Add transition animation sample, log to service sample.
Change-Id: I7021a7fbbe26d9c52699d7c2216452a5bd51452b
Xavier Ducrohet [Fri, 25 Sep 2009 22:50:34 +0000 (15:50 -0700)]
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.
Xavier Ducrohet [Fri, 25 Sep 2009 21:52:55 +0000 (14:52 -0700)]
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
Piotr Gurgul [Fri, 25 Sep 2009 20:00:25 +0000 (13:00 -0700)]
am
4af6620a: Merge change 26982 into eclair
Merge commit '
4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b' into eclair-plus-aosp
* commit '
4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b':
Add info about location of the coverage report
Android (Google) Code Review [Fri, 25 Sep 2009 19:49:48 +0000 (15:49 -0400)]
Merge change 26982 into eclair
* changes:
Add info about location of the coverage report
Xavier Ducrohet [Fri, 25 Sep 2009 17:59:40 +0000 (10:59 -0700)]
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.
Android (Google) Code Review [Fri, 25 Sep 2009 17:49:47 +0000 (13:49 -0400)]
Merge change 26983 into eclair
* changes:
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Piotr Gurgul [Fri, 25 Sep 2009 03:58:35 +0000 (20:58 -0700)]
Add info about location of the coverage report
Target 'coverage' outputs now path to the generated coverage report.
Change-Id: I442c0ff002c5d269cf1f573674105691df9caec5
Raphael [Fri, 25 Sep 2009 03:43:12 +0000 (20:43 -0700)]
am
bf95b308: Merge change 26996 into eclair
Merge commit '
bf95b3085438418b876ec5fb0ba0349c5fc133c0' into eclair-plus-aosp
* commit '
bf95b3085438418b876ec5fb0ba0349c5fc133c0':
JarUtils: Ignore visual source safe files in resources
Android (Google) Code Review [Fri, 25 Sep 2009 03:33:56 +0000 (23:33 -0400)]
Merge change 26996 into eclair
* changes:
JarUtils: Ignore visual source safe files in resources
Raphael [Fri, 25 Sep 2009 02:56:39 +0000 (19:56 -0700)]
JarUtils: Ignore visual source safe files in resources
BUG
1895888
Change-Id: I75af6ef9ba22701fae9e4c2b08f11b8a8c2aaaa6
Xavier Ducrohet [Fri, 25 Sep 2009 02:13:26 +0000 (19:13 -0700)]
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Change-Id: I4cf92b2f6ee66cd6f8e9b224879d8459e82949b6
Piotr Gurgul [Fri, 25 Sep 2009 01:45:47 +0000 (18:45 -0700)]
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
Android (Google) Code Review [Fri, 25 Sep 2009 01:35:55 +0000 (21:35 -0400)]
Merge change 26976 into eclair
* changes:
Add tested.project.dir to classpath for install and debug
Piotr Gurgul [Fri, 25 Sep 2009 01:17:22 +0000 (18:17 -0700)]
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.
Xavier Ducrohet [Thu, 24 Sep 2009 23:49:31 +0000 (16:49 -0700)]
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
Android (Google) Code Review [Thu, 24 Sep 2009 23:41:23 +0000 (19:41 -0400)]
Merge change 26915 into eclair
* changes:
Fixed screenshot command line tool to deal with new RawImage
Brett Chabot [Thu, 24 Sep 2009 23:14:17 +0000 (16:14 -0700)]
am
7d223329: Merge change 26741 into eclair
Merge commit '
7d2233294aefeb69ad4a17392bbd65044d22f258' into eclair-plus-aosp
* commit '
7d2233294aefeb69ad4a17392bbd65044d22f258':
Add workaround to runtest to build cts dependencies.
Raphael [Thu, 24 Sep 2009 23:14:13 +0000 (16:14 -0700)]
am
a5115b64: Merge change 26885 into eclair
Merge commit '
a5115b646e651228566b3a2823260cd7f70a882c' into eclair-plus-aosp
* commit '
a5115b646e651228566b3a2823260cd7f70a882c':
Tell the SDK that ApiDemoes requires Eclair preview.
Android (Google) Code Review [Thu, 24 Sep 2009 23:04:50 +0000 (19:04 -0400)]
Merge change 26741 into eclair
* changes:
Add workaround to runtest to build cts dependencies.
Xavier Ducrohet [Thu, 24 Sep 2009 21:33:45 +0000 (14:33 -0700)]
Fixed screenshot command line tool to deal with new RawImage
Also added a rotate method to DDMS.
Change-Id: I9ec2774ff0679b8b4f044341470b3dfa527f9680
Android (Google) Code Review [Thu, 24 Sep 2009 21:21:44 +0000 (17:21 -0400)]
Merge change 26885 into eclair
* changes:
Tell the SDK that ApiDemoes requires Eclair preview.
Xavier Ducrohet [Thu, 24 Sep 2009 21:16:37 +0000 (14:16 -0700)]
am
f9e2be14: Merge change 26901 into eclair
Merge commit '
f9e2be14764832f81a90f1f03ca9460be05191b3' into eclair-plus-aosp
* commit '
f9e2be14764832f81a90f1f03ca9460be05191b3':
Move the screenshot button above the image
Xavier Ducrohet [Thu, 24 Sep 2009 21:16:32 +0000 (14:16 -0700)]
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
Android (Google) Code Review [Thu, 24 Sep 2009 21:09:28 +0000 (17:09 -0400)]
Merge change 26901 into eclair
* changes:
Move the screenshot button above the image
Android (Google) Code Review [Thu, 24 Sep 2009 21:09:23 +0000 (17:09 -0400)]
Merge change 26893 into eclair
* changes:
Make archquery use the same VM as DDMS/Traceview
Brett Chabot [Thu, 24 Sep 2009 01:05:28 +0000 (18:05 -0700)]
Add workaround to runtest to build cts dependencies.
BUG
2141242
Xavier Ducrohet [Thu, 24 Sep 2009 20:20:42 +0000 (13:20 -0700)]
Move the screenshot button above the image
This will help when taking screenshots of large screen devices
on laptop screens.
Change-Id: Ief7b03d2f1711970e76f4dfe6086e3ea0d606c99
Xavier Ducrohet [Thu, 24 Sep 2009 19:16:03 +0000 (12:16 -0700)]
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.
Raphael [Thu, 24 Sep 2009 18:52:40 +0000 (11:52 -0700)]
Tell the SDK that ApiDemoes requires Eclair preview.
After the preview we'll change it to the final API level.
BUG
2141157
Xavier Ducrohet [Thu, 24 Sep 2009 06:42:31 +0000 (23:42 -0700)]
am
b936faf6: Merge change 26773 into eclair
Merge commit '
b936faf6e6a3e10408f257f948241cf984d7652a' into eclair-plus-aosp
* commit '
b936faf6e6a3e10408f257f948241cf984d7652a':
Disable clipping toggle when not supported.
Xavier Ducrohet [Thu, 24 Sep 2009 06:42:26 +0000 (23:42 -0700)]
am
b9b29878: Merge change 26740 into eclair
Merge commit '
b9b298782a9d33085e6df5d1d7c588178b4fb07a' into eclair-plus-aosp
* commit '
b9b298782a9d33085e6df5d1d7c588178b4fb07a':
Add warning on mismatch minSdkVersion.
Android (Google) Code Review [Thu, 24 Sep 2009 06:35:11 +0000 (02:35 -0400)]
Merge change 26773 into eclair
* changes:
Disable clipping toggle when not supported.
Android (Google) Code Review [Thu, 24 Sep 2009 06:34:55 +0000 (02:34 -0400)]
Merge change 26740 into eclair
* changes:
Add warning on mismatch minSdkVersion.
Xavier Ducrohet [Thu, 24 Sep 2009 03:42:28 +0000 (20:42 -0700)]
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.
Xavier Ducrohet [Thu, 24 Sep 2009 03:33:13 +0000 (20:33 -0700)]
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
Xavier Ducrohet [Thu, 24 Sep 2009 00:53:24 +0000 (17:53 -0700)]
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
Android (Google) Code Review [Thu, 24 Sep 2009 03:34:38 +0000 (23:34 -0400)]
Merge change 26540 into eclair
* changes:
Make the Density enum use the int value from the api Density enum.
Xavier Ducrohet [Thu, 24 Sep 2009 02:57:43 +0000 (19:57 -0700)]
am
00652320: Merge change 26751 into eclair
Merge commit '
006523204335a8c18ab57dbcd34a81a95a11d31f' into eclair-plus-aosp
* commit '
006523204335a8c18ab57dbcd34a81a95a11d31f':
Hide APK split UI (not ready yet)
Android (Google) Code Review [Thu, 24 Sep 2009 02:49:47 +0000 (22:49 -0400)]
Merge change 26751 into eclair
* changes:
Hide APK split UI (not ready yet)
Piotr Gurgul [Thu, 24 Sep 2009 01:34:29 +0000 (18:34 -0700)]
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
Xavier Ducrohet [Thu, 24 Sep 2009 01:22:49 +0000 (18:22 -0700)]
Hide APK split UI (not ready yet)
Change-Id: I2ace823139710e836c72cc323427024b54384e38
Piotr Gurgul [Wed, 23 Sep 2009 22:51:44 +0000 (15:51 -0700)]
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.
Piotr Gurgul [Wed, 23 Sep 2009 22:38:33 +0000 (15:38 -0700)]
am
95a32505: Merge change 26649 into eclair
Merge commit '
95a32505be164e0424d01fdd2b06c04cd54e6f06' into eclair-plus-aosp
* commit '
95a32505be164e0424d01fdd2b06c04cd54e6f06':
Define tested.project.dir property for existing samples
Android (Google) Code Review [Wed, 23 Sep 2009 22:30:28 +0000 (18:30 -0400)]
Merge change 26649 into eclair
* changes:
Define tested.project.dir property for existing samples
Xavier Ducrohet [Wed, 23 Sep 2009 04:01:14 +0000 (21:01 -0700)]
Make the Density enum use the int value from the api Density enum.
Change-Id: I13cace9a3fd7d17171ebe1e8b98c31adfa8509dc
Brett Chabot [Wed, 23 Sep 2009 20:27:34 +0000 (13:27 -0700)]
am
9f7ae08e: Add cts-media test definition in eclair.
Merge commit '
9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb' into eclair-plus-aosp
* commit '
9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb':
Add cts-media test definition in eclair.