Merge commit '2296cfbd37e696bd32e92c88a30dd290c7470018'
* commit '2296cfbd37e696bd32e92c88a30dd290c7470018':
Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
Merge commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f'
* commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f':
Fix NDK usage of libgcc.a when building shared libraries
Merge commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87' into eclair-plus-aosp
* commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87':
Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
* 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.
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.
Merge commit '9e4715e6d94e300605ab845c2e68bddaf8c23c8f' into eclair-plus-aosp
* commit '9e4715e6d94e300605ab845c2e68bddaf8c23c8f':
Fix ADT to use the new sdklib API
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
Merge commit 'fce2633d14323f837bfe0f58aee64006e76fe67d' into eclair-plus-aosp
* commit 'fce2633d14323f837bfe0f58aee64006e76fe67d':
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.
Merge commit '0bb8ca45303d5cf6004ede4d0a2aa225ab746fec'
* commit '0bb8ca45303d5cf6004ede4d0a2aa225ab746fec':
Added a target to run the Contacts tests using runtest.
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
- 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
Merge commit '3a683661975908a9bfe2ef4ae5097a8d4ad75b53' into eclair-plus-aosp
* commit '3a683661975908a9bfe2ef4ae5097a8d4ad75b53':
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
Merge commit 'c69e451084b96d94a368f9cba0a5f7104b7272ec'
* commit 'c69e451084b96d94a368f9cba0a5f7104b7272ec':
Sync DDMS/Traceview/Android version on the repository source.
Merge commit 'bcf2eea5bac62c8a43c1126fcca839ee31d9dee7'
* commit 'bcf2eea5bac62c8a43c1126fcca839ee31d9dee7':
Add info about location of the coverage report
Merge commit '31727ecbd99cd174fc713ca89c373adc117d7d73' into eclair-plus-aosp
* commit '31727ecbd99cd174fc713ca89c373adc117d7d73':
Added a target to run the Contacts tests using runtest.
Merge commit '0f61aa6470c2ac6c8cae6c356bb7ce658b71b5ac' into eclair-plus-aosp
* commit '0f61aa6470c2ac6c8cae6c356bb7ce658b71b5ac':
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
Merge commit '4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b' into eclair-plus-aosp
* commit '4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b':
Add info about location of the coverage report
Merge commit '007aece2843d42eb04aba591f35dd106af40e04c'
* commit '007aece2843d42eb04aba591f35dd106af40e04c':
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Merge commit '6f7e4180833abd1a20fd6f39b32312aa2001075b'
* commit '6f7e4180833abd1a20fd6f39b32312aa2001075b':
Add tested.project.dir to classpath for install and debug
Merge commit 'f0581300ba2ae450bb03452d09b1fedfb4c9b7b2'
* commit 'f0581300ba2ae450bb03452d09b1fedfb4c9b7b2':
Fixed screenshot command line tool to deal with new RawImage
