Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
Bug #2549649
If the window had a different size than its content but the content had already
been measured with the appropriate size, the window would not be resized. This
happens in wrap_content windows (dialogs.) This change simply adds a new codition
to window resizing: if the window is wrap_content, not as big as it can be and
not as big as its content, it gets resized.
Change-Id: I1d82d03af5a15c9ad8dffa0511d5f6d522578285
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp
* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
2568467 System crash when installing corrupt APK
Also fix another crash I just saw in the package manager, when a
permission got left around from a previous install but as no
longer defined.
Change-Id: I33b87420f0c59e24b8b77fab8b0316461d99e048
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp
* commit '21390f08138801f9e008917c0c0149839a80d002':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp
* commit '0db37997366a4d781af48be758a9d90b6d07d7d5':
Revert to previous text selection behavior
Merge commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp
* commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12':
Add an extra for the Disconnect Headset State.
There was a new behavior that starting "Select text" would allow you to
swipe from beginning to end and immediately copy that. This change
reverts to the previous behavior that "Select text" will start where
your cursor is currently and any tap will extend the selection from that
origin to the point of the tap.
Change-Id: Ib955cc8d62a652f518435953da2f54e810d9dfb0
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp
* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp
* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
check for webviewcore before reading settings
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.
Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp
* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
Only include WEB_EDIT if there are more textfields.
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp
* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
Make sure when WebView modified mScrollX/Y directly,
onScrollChanged() is called so that the View system
can do what it needs to adjust.
As WebView's onScrollChanged will call sendOurVisibleRect(),
we don't need to call it explicitly any more.
Fix http://b/issue?id=2438457
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp
* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp
* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
Add a new intent category used for activities running in carmode.
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 '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp
* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
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 '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