Merge commit '6d924c69af055559ed84afaf487aa38bd6fd2e33' into eclair-mr2-plus-aosp
* commit '6d924c69af055559ed84afaf487aa38bd6fd2e33':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2
* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
Merge commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7' into eclair-mr2-plus-aosp
* commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit '1e23a4019a2782054fc2c72f243008e29e13b411' into eclair-mr2-plus-aosp
* commit '1e23a4019a2782054fc2c72f243008e29e13b411':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2
* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2
* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Merge commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315' into eclair-mr2-plus-aosp
* commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315':
Add a new API for initing Wifi multicast filtering
Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp
* commit '54616f3435e67029006d2f77462c61ed0635a3f6':
Make MockCursor class a part of public SDK.
With this class, external developers will be able to reduce their
redundant work related to testing around ContentProvider/ContentResolver.
Internal Issue number: 2181010
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp
* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
We need this info in the ServiceState, but rather than calcing it every time
a ServiceState is requested, we can update the values whenever the constituents
change.
bug: 2182568
Merge commit '3f9faf473712be7d6471913b921bf8a63ab3205d' into eclair-mr2-plus-aosp
* commit '3f9faf473712be7d6471913b921bf8a63ab3205d':
When WebView has wrap_content, we are sending WebKit
Merge commit '2f3dc5b9ce0e3907e529c88728b166d66beccab5' into eclair-mr2-plus-aosp
* commit '2f3dc5b9ce0e3907e529c88728b166d66beccab5':
Draw dividers between <optgroup> and <option> elements.
Merge commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50' into eclair-mr2-plus-aosp
* commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50':
fix multiple text areas, and text areas without focus rings
0 height to get the exact height. But if the View system
doesn't think the WebView dimension changed, even we
call requestLayout, we won't get onSizeChanged. So
we never notify the WebKit about the final view size.
If updateLayout is true, which is probable because that
we set the height to be 0 to WebKit, just call requestLayout()
even the meansured height / width is matching the
content height / width.
Fix http://b/issue?id=2162991
If the typed key doesn't go with the current text area, clear
the focus so the key won't return to that text area. However,
don't clear the focus if it is already off the old text area.
fixes http://b/issue?id=2201049
Merge commit 'a8da17356f9a385e097e3eef205358462d214538' into eclair-mr2-plus-aosp
* commit 'a8da17356f9a385e097e3eef205358462d214538':
Do not show radio/checkboxes for <optgroup> labels.
Fix for http://b/issue?id=2186188. Keep track of <optgroup> labels
separately from disabled <option> labels. Requires a change to
external/webkit.
In CheckedTextView, if the CheckMarkDrawable is set to null,
remove it.
Merge commit '8785c064fab3429c792ac160aeeb19e9926382f0' into eclair-mr2-plus-aosp
* commit '8785c064fab3429c792ac160aeeb19e9926382f0':
Let PLUS occur once anywhere in dial-str network portion.
Create a new extractNetworkPortion() function, since the old one is
public, that does effectively the same thing but is more flexible as
just mentioned.
Addresses issue:
http://buganizer/issue?id=2013998
Change-Id: Ie5df08ef9c871881e8728a44abf0385908000823
* changes:
If we fail to persist the current settings and fall back to the back settings file when reading settings in PackageManager, we might rename the corrupted settings to backup(in case of power failure between the earlier write failure and file deletion) and end up loosing both files. So just clear up the corrupted current settings file if we have backup. The backup wouldn't exist if everything went well with persisting the earlier settings.
Merge commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp
* commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5':
It turns out to be useful to allow enumeration on a per-tag basis,
when reading settings in PackageManager, we might rename the corrupted settings to
backup(in case of power failure between the earlier write failure and file deletion)
and end up loosing both files.
So just clear up the corrupted current settings file if we have backup.
The backup wouldn't exist if everything went well with persisting the earlier settings.
We do this in both read and write just in case.
* changes:
It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().
Merge commit '5af4cf47b94383deb47648240036c7090f46fd41' into eclair-mr2-plus-aosp
* commit '5af4cf47b94383deb47648240036c7090f46fd41':
add dpad control of text selection for sholes
Merge commit '32de91306233b08604ce7a158a37235c7042ae13' into eclair-mr2-plus-aosp
* commit '32de91306233b08604ce7a158a37235c7042ae13':
Fix high density bug 2179543: use 'dip' instead of 'px'
WebView.mHeldMotionless should only be set to MOTIONLESS_FALSE
if some scrolling occurs, even in the case where motion is discarded
by snap-scroll mode.
Refactoring the code allows the code to be smaller, and provides
a single point where scrollBy() is called while dragging.
This doesn't change the snap-scroll logic in any way.
related to http://b/issue?id=2092446
Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
