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:
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
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 '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1' into kraken
* commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
Merge commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp
* commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
will have a reference of the current window's main
WebView. It is only non-null if the WebView's window
has the focus.
Extract setActive() from onWindowFocusChanged() so
that onAttachedToWindow() can call it directly. The
old way has a mis-matching call to onWindowFocusChanged.
Fix http://b/issue?id=2559152
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.
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken
* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
Fix for bug 2558156: Encodig is null
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp
* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
Fix for bug 2558156: Encodig is null
This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.
Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken
* commit 'fe72c533fe210e147111e0a862360032365dd987':
As we don't support over scroll any more, we need
