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 '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 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp
* commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
Fix for bug 2564771 - pitch setting between apps can
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 '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 '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
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
Fixes DumpRenderTree to re-use HTTP authentication credentials
This is required for layout test http/tests/appcache/auth.html
Bug: 2098423
Change-Id: Ic9531e3c23a2fa9ebfab70cde3172550f572a404
This change forwards to the WebView HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the WebView to store these
credentials for use with later requests.
This is a re-working of https://android-git.corp.google.com/g/46430
Bug: 2544330
Change-Id: I3f04433b00233d7b7bf4f7e3471d8d15d8817f93
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp
* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
As we don't support over scroll any more, we need
1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task
bug - 2553862
Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp
* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder