Merge commit '23703f16f816d4212e5a95c101a851660c095f24' into eclair-plus-aosp
* commit '23703f16f816d4212e5a95c101a851660c095f24':
Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp
* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Lot of infrastructure for more things to go away when "clear system dialogs"
happens, and now do this when we turn on the lock screen.
Change-Id: I567130296fe47ce82df065ed58ef21b37416ceaf
Merge commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7' into eclair-plus-aosp
* commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7':
Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316' into eclair-plus-aosp
* commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316':
Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
Merge commit '85abdc59c3a31df6dc6ac4f20e64d5c91fa70023' into eclair-plus-aosp
* commit '85abdc59c3a31df6dc6ac4f20e64d5c91fa70023':
Make the new ContactsContract public.
Contacts app's EditContactActivity now explicitly set those to null, so I thought vCard importer
also shold do so.
Internal issue number: 2141766
TODO:
Contacts app's side should be also modified to completely fix the issue above.
Merge commit '8799b96ea09d5fdd9904dd9de3002c0a9cd28fdc' into eclair-plus-aosp
* commit '8799b96ea09d5fdd9904dd9de3002c0a9cd28fdc':
Delay broadcasting ACCOUNTS_CHANGED until we're certain AndroidId is ready.
Merge commit '8f1e598118d612988ffecfa979778e9aab4ece57' into eclair-plus-aosp
* commit '8f1e598118d612988ffecfa979778e9aab4ece57':
make the SyncManager listen for backgroun data setting changes and do a sync when the setting is enabled
Merge commit '193a6261894619985866220c320017f0831d6055' into eclair-plus-aosp
* commit '193a6261894619985866220c320017f0831d6055':
add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
* changes:
add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
Merge commit '37703b6c875a935e6341d8a710796bc0c87d3044' into eclair-plus-aosp
* commit '37703b6c875a935e6341d8a710796bc0c87d3044':
invalidate the webview after pressing the IME 'next' button
Merge commit '6d181166a2e5c819e274397f90e33d340061750f' into eclair-plus-aosp
* commit '6d181166a2e5c819e274397f90e33d340061750f':
Provide a getter to access the width of the HTML document.
Merge commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656' into eclair-plus-aosp
* commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656':
add definition for Mms.TempStorage content uri and filename.
Merge commit 'b82665e78f3a4f08e7b620b85246b7925097386b' into eclair-plus-aosp
* commit 'b82665e78f3a4f08e7b620b85246b7925097386b':
don't allow min scale to go to infinity
When a new picture is received, the min zoom scale is set.
One of the many choices divides by draw.mMinPrefWidth, even
if it is zero. Add a check to require it to be greater than
zero before using it as a ratio component.
fixes http://b/issue?id=2138786
Merge commit 'c28e3a670fd993d5465504ed48e9e89bb24823b0' into eclair-plus-aosp
* commit 'c28e3a670fd993d5465504ed48e9e89bb24823b0':
Move destroying the web view to the WVC thread (previously it was on the UI thread)
Merge commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66' into eclair-plus-aosp
* commit 'd4c00a173aacf815bb8c5bcffaab21da61ac7d66':
In calcOurContentVisibleRect, account for the visible title bar.
Merge commit 'dbce92ab0bc874420f237cc06f615470080ebc6a' into eclair-plus-aosp
* commit 'dbce92ab0bc874420f237cc06f615470080ebc6a':
Back button in search always goes back or closes search
