Merge commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b' into kraken
* commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp
* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken
* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
Add a new intent category used for activities running in carmode.
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp
* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
Add a new intent category used for activities running in carmode.
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken
* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
revert the stripping of System Group:
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp
* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
revert the stripping of System Group:
Allow the user to start scrolling back into content immediately
after dragging past the end of content.
Remove some dead code.
Change-Id: Ife8f60499ac58179ba1e2500ca8745916392a4bc
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken
* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Merge commit '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp
* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
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