Merge commit '36cad7be504608a538c845b4a44f0dcee157a338'
* commit '36cad7be504608a538c845b4a44f0dcee157a338':
Add cancel() VCardDataBuilder, which is intended to remove
Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394'
* commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394':
Don't reinflate search bar when dialog is already showing
Merge commit '11782b905292ebde1b591f6561913affdfd415fc'
* commit '11782b905292ebde1b591f6561913affdfd415fc':
Extend the date time to handle the case where the
Merge commit '492eb109ff704c0dfec447a88920657cb230b8d6'
* commit '492eb109ff704c0dfec447a88920657cb230b8d6':
Work on issue #2163789: Way too much logging
Merge commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c'
* commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c':
bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7'
* commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7':
Fix a null pointer exception caught by the monkey.
Merge commit '9eca703d08ef2ef81796519fdd60a774380c7d4c'
* commit '9eca703d08ef2ef81796519fdd60a774380c7d4c':
setupRedirect() can throw. Catch it and signal the error.
Merge commit '86806ce11a89260147d7c2efa2c192b711d923db'
* commit '86806ce11a89260147d7c2efa2c192b711d923db':
Process synchronous requests in the same RequestQueue.
Merge commit '07086eb9dd351f716843ddc4ff7afbd15d25d49c' into eclair-mr2-plus-aosp
* commit '07086eb9dd351f716843ddc4ff7afbd15d25d49c':
Add cancel() VCardDataBuilder, which is intended to remove
* changes:
Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.
Merge commit '3448b676e9e7562a9b2de54951ac19eae43a6864' into eclair-mr2-plus-aosp
* commit '3448b676e9e7562a9b2de54951ac19eae43a6864':
Don't reinflate search bar when dialog is already showing
Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2
* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
Don't reinflate search bar when dialog is already showing
Merge commit '7fd7534b58b523851e932f8b1bde61532b738e8a' into eclair-mr2-plus-aosp
* commit '7fd7534b58b523851e932f8b1bde61532b738e8a':
Extend the date time to handle the case where the
Change https://android-git.corp.google.com/g/27729 started reinflating
the entire search bar every time the search source was changed, to get
around problems with bad state in AutoCompleteTextView
(http://b/issue?id=2132686). This had some side-effects if the
search dialog was already visible, as it is when selecting a
source in "More results" or when presing the search key to go to
QSB from in-app search.
This change changes the reinflation to only happen if the dialog is
not already showing.
Fixes:
http://b/issue?id=2166640
"After selecting More results from suggestions, the search box is no longer visible."
http://b/issue?id=2166675
"Calling QSB with the hardware key does not place focus in the search tab."
http://b/issue?id=2166712
"back key has unexpected behaviour in QSB after selecting "More results" from suggestions."
Change-Id: I8d48149c3e9ad97ec11c49ec7efb356f27dfe4f6
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2
* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
Work on issue #2163789: Way too much logging
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-mr2
* commit '6b3707452c5921c89258371eec140b0fb76766f8':
bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Use a dedicated Connection to process a synchronous request using the main
RequestQueue and on the WebCore thread.
HttpConnection, HttpsConnection, Connection:
No need for ConnectionManager, just pass the proxy host to
HttpsConnection. In Connection.clearPipe, empty should be set to true if the
RequestFeeder does _not_ have a request for the host. I don't think that
broke anything but it is incorrect.
ConnectionThread:
Refactor the proxy selection into ConnectionManager.getConnection
RequestHandle:
Add a new constructor that takes a Connection argument. Add processRequest
to process a single request on that Connection.
RequestQueue:
Add determine host to select between the request's host and the proxy. Add
queueSynchronousRequest to make a new request that operates on a private
connection. Add SyncFeeder to handle RequestFeeder.requeueRequest if the
request fails.
Network: Use the new RequestQueue api to handle a synchronous request.
Bug: 1315832
This is the frameworks/base part of the fix for Bug 2158434: add a new
callback to the OnDialTriggerListener interface, so the RotarySelector can
tell the app about state changes between NOTHING_GRABBED and
LEFT_HANDLE_GRABBED and RIGHT_HANDLE_GRABBED.
BUG=2158434
DRNO=timsullivan
TESTED=regular incoming calls, call waiting calls, answering a call,
rejecting a call. Also verified I didn't affect the
lock screen at all.
AbsListView can reject views from the recycler's scrap heap but when that
happens the rejected view is not detached from the parent. This can be pretty
bad in the case of TextView since it prevents them from unregistering their
OnPreDrawListeners.
Merge commit '88be4cb5ee6718a971f18cc14a5699204d28e082'
* commit '88be4cb5ee6718a971f18cc14a5699204d28e082':
Close the cursor before assigning a new one to the same variable.
Merge commit '51654b562b3faaf358b55124ad5290847bdceabd'
* commit '51654b562b3faaf358b55124ad5290847bdceabd':
On BACK in search, hide just IME if IME is fullscreen
Merge commit 'ad433430126bec9a1361dd857635aa494d3d6a10'
* commit 'ad433430126bec9a1361dd857635aa494d3d6a10':
remove cert for SampleBrowserPlugin and only check
Merge commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39'
* commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39':
Semi-workaround for #2027266: app drawer showing up on the side of the screen
