Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911: Crash in system process
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
Merge commit '7d028a0a974fdee240cac7118bf47c96777ea533'
* commit '7d028a0a974fdee240cac7118bf47c96777ea533':
Separate API for vCards through openAssetFileDescriptor().
Merge commit 'b74e2ac44c72c846095334fab7f60111c1271f34'
* commit 'b74e2ac44c72c846095334fab7f60111c1271f34':
Modify the "active chats" uri to not overlap with other uris.
Merge commit '39433f818b223aab50b264fb43e8e32da1d8151a'
* commit '39433f818b223aab50b264fb43e8e32da1d8151a':
Do not crash appwdiget host when a pending intent send fails.
Merge commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0'
* commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0':
Fix issue #2149145: Safe Mode does not work on Sholes device
Merge commit '1492b96eb178631b816bdb253a1b6d1df8133e13'
* commit '1492b96eb178631b816bdb253a1b6d1df8133e13':
Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit '7745e035c94409815850be4be93a300301da576e' into eclair-plus-aosp
* commit '7745e035c94409815850be4be93a300301da576e':
Skip requestRectangleOnScreen for WebTextView during
* changes:
Skip requestRectangleOnScreen for WebTextView during zoom animation. If it is in edit mode, we already adjust WebTextView in the end of zoom animation.
Merge commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9' into eclair-plus-aosp
* commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9':
Fix bug where we would return null with disabled components.
Both GlobalSearch and the search dialog now pass
SearchManager.SUGGEST_PARAMETER_LIMIT as a query parameter to all
suggestion sources. Exposing this allows suggestion sources
to return only the number of results that the client requires.
Fixes http://b/issue?id=2150992
Change-Id: I17f45d35e8f302b11812f4bb6fee40b31dc15707
Merge commit 'ffc165446a7188cadfbc9f99fafac27d11254a54' into eclair-plus-aosp
* commit 'ffc165446a7188cadfbc9f99fafac27d11254a54':
Fix issue #1930911: Crash in system process
Merge commit '0368334db91e923021df36ae9afb81ed8256abfd' into eclair-plus-aosp
* commit '0368334db91e923021df36ae9afb81ed8256abfd':
Finish off java API to allow fading scrollbars
Merge commit 'ff18bbf83562b8a827a37c19cdc27e520786119e' into eclair-plus-aosp
* commit 'ff18bbf83562b8a827a37c19cdc27e520786119e':
Separate API for vCards through openAssetFileDescriptor().
Previously we overloaded Contacts.CONTENT_URI to return
vCard-formatted Contacts entries. To fix http://b/2138790
this is a separate API that returns a well-known MIME-type.
Also helps fix http://b/2078399 by adding OFFICE_LOCATION.
Merge commit 'f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp
* commit 'f36a2bb59b846545946124124d3290bd3eec44f0':
Call the proper variant of markAsContacted.
Merge commit '1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp
* commit '1cff74761798eba8349a3b9824ae4b11072c11d1':
Modify the "active chats" uri to not overlap with other uris.
- Add FOR_EXPORT_ONLY to Data column.
- Make VCardComposer use Contacts instead of RawContacts.
- Make VCardComposer honor FOR_CONTACT_ONLY regardless of
the intention of any caller, which makes composer unable to
compose any contact with "is_restricted" flag, which is unseen
from outside the contacts provider.
Internal Issue number: 2147248, 2143207
Merge commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35' into eclair-plus-aosp
* commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35':
Do not crash appwdiget host when a pending intent send fails.
Merge commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp
* commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef':
Fix issue #2149145: Safe Mode does not work on Sholes device
Merge commit 'fe81d386a818b386ffc0d5a789236531ab4e264f' into eclair-plus-aosp
* commit 'fe81d386a818b386ffc0d5a789236531ab4e264f':
Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f' into eclair-plus-aosp
* commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f':
Fix possible NPE in AbsListView.positionSelector().
