Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken
* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp
* commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
Fix 2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.
This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior. New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.
Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed
Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
Move all tests for android.* classes from tests/AndroidTests and
tests/CoreTests into framework/base/<core|graphics>/tests.
Consolidate all tests for java.* classes to tests/CoreTests.
Eventually hopefully these will be moved to dalvik/ somewhere.
Remove tests/AndroidTests entirely.
Change-Id: I86584d086ab7bd045bb38a10b699907805298a95
Merge commit '3079afaaf549316483a0f30d22eb157656ca7951' into kraken
* commit '3079afaaf549316483a0f30d22eb157656ca7951':
Use flattenToShortString instead of toShortString on ComponentNames to
Merge commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp
* commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7':
Use flattenToShortString instead of toShortString on ComponentNames to
be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have
been using toShortString because that includes curly braces and is not
correctly parsed by ComponentName.unflattenFromString.
This was needed as part of http://b/2546173
Change-Id: If34a9273cbcae13a75347be0b6b7ef307134ed40
Merge commit '9ea4668c3fabba6d9b8e610030d2ba370b782e86' into kraken
* commit '9ea4668c3fabba6d9b8e610030d2ba370b782e86':
Fix for bug 2564771 - pitch setting between apps can
Merge commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp
* commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
Fix for bug 2564771 - pitch setting between apps can
Merge commit '948e7dc0ab6f0fae71fa76a438d084928d36569f' into kraken
* commit '948e7dc0ab6f0fae71fa76a438d084928d36569f':
Add the test template for the media audio manager test.
Merge commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1' into kraken
* commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
Merge commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48' into froyo-plus-aosp
* commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48':
Add the test template for the media audio manager test.
Merge commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp
* commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
interfere with one another.
Root cause was not caching all the params that were needed.
This change fixes that bug as well as related bugs for remembering
the default engine and for making sure that the right engine is
loaded when checking for language availability.
Change-Id: I2a76da8faec8112036e68d27539db444c53a1509
Merge commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba' into kraken
* commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit '11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp
* commit '11fb6144604fbd1148695421e9ab6896701a431b':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
The only remaining test here was RingtonePickerActivityTes, which has been
suppressed since pre-donut.
Change-Id: I74c08c9c9447b67252430db3b462373af879bd1d
Merge commit 'd12d6c305caeea556781083152e741bdb3863eff' into kraken
* commit 'd12d6c305caeea556781083152e741bdb3863eff':
Public API changes for CameraProfile and CamcorderProfile classes
Merge commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp
* commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
Public API changes for CameraProfile and CamcorderProfile classes
The asserts were removed from that class and replaced by a status String object.
This allows ExpandableListTester to do the asserts instead.
These tests passed on a sapphire and passion devices as well as in the emulator.
The asserts in the main thread are expected to make these tests pass during the
continuous build too.
This is 7fbddb1db1beeac7c6762fb7a11612e348f6ff90 cherrypicked to froyo.
http://b/issue?id=2525846
