Merge commit '822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken
* commit '822a7e2defcfbd006a7840e1da19cf0827d46736':
Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp
* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken
* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
Revert "Use the content width to calculate the zoom overview"
...shows an image downloaded by the browser
The downloads directory needs to be non-plural for backwards compatibility.
Change-Id: Ifb6ddf8ee980a57ad113a5fc8b51f5acd8df5955
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp
* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
Revert "Use the content width to calculate the zoom overview"
mResources will be null if we failed loading them because the app
is on external storage that has been unmounted.
Change-Id: If0dbbdc0c3441fa10d0ab074568361524db1c8db
disable high-quality filtering during scrolling, until I can cached the scaled images.
Change-Id: I58fa779a8d9a23a20a0fdd93ea06c251b6c6ca8d
Fix http://b/issue?id=2574172
Merge commit '692329cf3f1512b3f0475b619058f9a10d9950a8' into kraken
* commit '692329cf3f1512b3f0475b619058f9a10d9950a8':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Merge commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp
* commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp
* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp
* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Merge commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken
* commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
Search for focusable views only after layout has happened when the window is first created.
Merge commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp
* commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
Search for focusable views only after layout has happened when the window is first created.
Merge commit 'efaee761022305d74e63237d87809582514bd5e2' into kraken
* commit 'efaee761022305d74e63237d87809582514bd5e2':
Show the microphone when the search box is opened from browser
Merge commit '083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp
* commit '083c715d06a99951429b38c62484f8c3caf43cd1':
Show the microphone when the search box is opened from browser
Fix for http://b/issue?id=2549036
Also required moving the call to updateWidgetState to after the
update of mUserQuery so mUserQuery could be used as a comparison.
Change-Id: I4996f09c02751a6d74e8f517669025e4bdd709d8
Merge commit '93720cad0c2905e7d0a80aee154684396d8b0ed1' into kraken
* commit '93720cad0c2905e7d0a80aee154684396d8b0ed1':
Add more WindowManager flags to ViewDebug.
Merge commit 'c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp
* commit 'c957ebef9755d15f92c27d690641995587c0ba2f':
Add more WindowManager flags to ViewDebug.
Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken
* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
Comment-only change to clarify the role and use of IntentService
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp
* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
Comment-only change to clarify the role and use of IntentService
This is a fix for http://code.google.com/p/android/issues/detail?id=907. Note that
that issue was declined without comment, but the bug (while incredibly minor)
does exist. This can be seen on the facebook app, as well as many third party apps.
Change-Id: I8f1449c47228f5f757a5baf389656e51c817b150
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken
* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
Correctly resize dialogs when measured in WRAP_CONTENT
Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
