Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-mr2
* commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f':
Fix the layoutlib test to run from adt-tests.
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-mr2
* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '71060f29855745893c122e8b93cf7a723186931b' into eclair-mr2
* commit '71060f29855745893c122e8b93cf7a723186931b':
Refactor class/method names used by layoutlib_create.
Tell the broadcast receiver whether it is getting an initial sticky value,
so it will be quiet about attempts to do ordered broadcast stuff.
Note that the original bug being reported was not actually a crash, just
an error log. So all we are doing here is making the log quieter.
Change-Id: Iaf1b718d82093ec1197142410a64feff47eb3859
Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-mr2
* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
This is in accordance to the documentation. This bug was approved by hackbod.
The change is safe and is a single line of code.
Change-Id: I9b771df3ae2aa4f496d15e6c43b677f3245539ac
Information about classes and methods that are replaced, renamed, removed
into CreateInfo, so that it can be used by the tests.
Change-Id: I8874a40503249416621aa90b2ca02dcaf30ecd57
* 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 '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2
* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
Don't reinflate search bar when dialog is already showing
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 '9830a4ac42c9e16db91d1de6120cc2eb613fc946' into eclair-mr2
* commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946':
Fix issue #2161169: onStop not being called.
There was a bug with the starting window where it could be added to
the app window list twice, so the buddy list would end up with one
left over after all was done. This would result in visibility
changes not being delivered to it correctly, delaying the dispatch
of onStop.
Change-Id: If1993eaf9cfbba1f523ce5aaa478be0239d0c7db
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2
* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
Work on issue #2163789: Way too much logging
Merge commit '87d5004d3b62441a55b2aba870e4276af6c771eb' into eclair-mr2
* commit '87d5004d3b62441a55b2aba870e4276af6c771eb':
decode the search string before putting it into the search control.
Merge commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-mr2
* commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38':
dumpstate: Add backlight information to bugreport output.
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2
* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
Attempt to fix [2152536] ANR in browser
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-mr2
* commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
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.
Merge commit '3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-mr2
* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
Import revised translations. DO NOT MERGE
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2
* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2
* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
Add a test pattern as rollo's icon
Merge commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair
* commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3':
decode the search string before putting it into the search control.
