Merge commit 'b824d519146a813dff72f4baa4a1c7abbf78b962'
* commit 'b824d519146a813dff72f4baa4a1c7abbf78b962':
Distinguish jar folders and jar files in ApkBuilder script
Merge commit '265513f5d3388f14c80a46d2fe033e0d93a9fdf1' into eclair-plus-aosp
* commit '265513f5d3388f14c80a46d2fe033e0d93a9fdf1':
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.
Merge commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc' into eclair-plus-aosp
* commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc':
Fix possible NPE in DDMS plugin init.
* changes:
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.
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"
Merge commit '3724033353aa535248659ad86f4d4c1c2a10fb75' into eclair-plus-aosp
* commit '3724033353aa535248659ad86f4d4c1c2a10fb75':
Add a new skin to the SDK.
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 '780a7fa1f51a9d42e644401ef69b79e151198794' into eclair-plus-aosp
* commit '780a7fa1f51a9d42e644401ef69b79e151198794':
Add build path info to runtest --list_tests
Merge commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c' into eclair-plus-aosp
* commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c':
Update the SDK/AVD manager toolbar icon tooltip to be consistent.
Merge commit 'd4d74b2b41450290298bb3f20e28afda432ed1b5'
* commit 'd4d74b2b41450290298bb3f20e28afda432ed1b5':
Add an XPath Ant task to be used in the android_rules.xml file.
