Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken
* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
Fix 2325549: Allow up to 4 lines of summary text in Settings
Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp
* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
Fix 2325549: Allow up to 4 lines of summary text in Settings
This fixes a number of screens in Settings (see the bug for examples).
Though it seems like a scary change, it should be safe since
the added line doesn't affect layout unless it's used, in which
case the view is slightly taller.
Change-Id: I13d04efadee19b407febabfae7825aedf66e8744
Merge commit 'e725a9634b0cea150b29755ed94c53e621b4f273' into kraken
* commit 'e725a9634b0cea150b29755ed94c53e621b4f273':
remove OTA packages from the old (pre-froyo) updater
Merge commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0' into froyo-plus-aosp
* commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0':
remove OTA packages from the old (pre-froyo) updater
The old updater ran in the system process, so only that UID can delete
its downloads. Do this on startup in case we've just upgraded from
something before froyo and need to clean up those packages.
b/2571619 - eclair -> froyo update package not deleted
Change-Id: I0a5e7834c3ecd2cc2f6fd73052b3a38e1294b5d5
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken
* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '16197a246fdeff0167f9abdc6a3da5d83759993d' into kraken
* commit '16197a246fdeff0167f9abdc6a3da5d83759993d':
Revert to previous text selection behavior
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 'f84207f6ca90307b10d94e484baf55330d644c1d' into kraken
* commit 'f84207f6ca90307b10d94e484baf55330d644c1d':
Add an extra for the Disconnect Headset State.
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 '733a2f654934d452b2febf6f80cd1136830758d5' into kraken
* commit '733a2f654934d452b2febf6f80cd1136830758d5':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken
* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp
* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
Make createVideoThumbnail and createImageThumbnail look consistent.
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.
Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken
* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
check for webviewcore before reading settings
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 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken
* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
Only include WEB_EDIT if there are more textfields.
