Merge commit '61676a4061ef0400baa0c75c44a06bf740a55dc6' into eclair-plus-aosp
* commit '61676a4061ef0400baa0c75c44a06bf740a55dc6':
Make the Density enum use the int value from the api Density enum.
This is only supported in Eclair+, so the toggle button
is disable if the edited file is donut or before.
Change-Id: I8bf1f8a8aa3604f269cb226d788c5e1438a5ae0b
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
Merge commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc' into eclair-plus-aosp
* commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc':
Fix possible NPE in DDMS plugin init.
Merge commit 'd582592ea58188ad3b43523326dda5f9ae2669c7' into eclair-plus-aosp
* commit 'd582592ea58188ad3b43523326dda5f9ae2669c7':
Disable menu items based on device/app selection.
Merge commit 'c733a52949c8f98e57ca360cb421f480487ff774' into eclair-plus-aosp
* commit 'c733a52949c8f98e57ca360cb421f480487ff774':
Force update to the next plugin.
Merge commit '350187ab93e12031ddcd57e5faa2312e6099ebba' into eclair-plus-aosp
* commit '350187ab93e12031ddcd57e5faa2312e6099ebba':
Create Density based resource values when needed.
This will let the layoutlib know when to scale bitmaps
that are not in the native density of the rendering.
Change-Id: I08c99666460b5b5a3ed8d0aac7fa1b7c0136fd6b
Merge commit '038300d95f69ab2ddf56526bcfc5f1028c40e6f2' into eclair-plus-aosp
* commit '038300d95f69ab2ddf56526bcfc5f1028c40e6f2':
Fix the qualifier match algorithm.
Merge commit 'fa0062da90e158b18a4250a003304bf40832423a' into eclair-plus-aosp
* commit 'fa0062da90e158b18a4250a003304bf40832423a':
Add legacy support for application.package property
application.package in android_rules.xml and android_test_rules.xml has been
replaced by manifest.package which value is taken from AndroidManifest.xml.
This is because old versions of build.properties contain already
application.package property which has precedence over the extracted one
and overrides it.
Change-Id: I909e145926169922ec6ec0e179ad88c413aa85b2
Merge commit 'dd9683a8247c8e14619d068f81d10dea10e4decb' into eclair-plus-aosp
* commit 'dd9683a8247c8e14619d068f81d10dea10e4decb':
Add support for Keyboard state "Soft"
Adds tested.project.dir=".." to ProjectDir/tests/build.properties in order
to indicate automatically that this is a test project and point the
tested project directory.
Merge commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f' into eclair-plus-aosp
* commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f':
Distinguish jar folders and jar files in ApkBuilder script
Automatic extraction of the application.package property has been added
leveradging xpath ant task. This reduces redundancy, removes hardcoded
application.package and solves bug with uninstalling test application
package. In order to function properly needs removing application.package
from build.properties file.
Merge commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c' into eclair-plus-aosp
* commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c':
Update the SDK/AVD manager toolbar icon tooltip to be consistent.
Merge commit '303d694863f055f09ed9b4a1b2eebeb809a2ddad' into eclair-plus-aosp
* commit '303d694863f055f09ed9b4a1b2eebeb809a2ddad':
Add an XPath Ant task to be used in the android_rules.xml file.
debug-helper macro has been renamed to zipalign-helper to reflect better its
function. Two parameters for input and output packages have been introduced.
Macro has been additionally leveradged in 'release' target where zipalign
was previously called directly, duplicating the code.
Merge commit 'fddd720cf2530606b86f9a18f6e397dd9988958d' into eclair-plus-aosp
* commit 'fddd720cf2530606b86f9a18f6e397dd9988958d':
Add global verbosity control for SDK ant targets
The user-configurable property 'verbose' has been introduced. It is set by
default to 'false' and switching in on enables verbose mode for all the
intermediate steps for a given target.
This task is designed to run XPath expression targetting Android XML files.
It will handle the Android namespace with the 'android' prefix, and store
the result of the XPath into a property.
Change-Id: I9094f5661d5e1ef86553ee1c54bdeca62366e0cd
classname: XPathTask
classpath: anttasks.jar, sdklib.jar
Usage:
<xpathtask input="path/of/file/to/read" output="name.of.property.to.write"
expression="/xpath/expression/to/evaluate" />
Merge commit 'fbc5cc7488204b9b74acc587efa3c5d76a52c58b' into eclair-plus-aosp
* commit 'fbc5cc7488204b9b74acc587efa3c5d76a52c58b':
Fix a bug in processing jarfolders in ApkBuilder
