Merge commit 'aed865207f7425f6c4d0538decb04109c415410d'
* commit 'aed865207f7425f6c4d0538decb04109c415410d':
Clean up cacheColorHint to be better controlled by the theme.
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 '1492b96eb178631b816bdb253a1b6d1df8133e13'
* commit '1492b96eb178631b816bdb253a1b6d1df8133e13':
Remove obsolete links; start at a method to turn on fading scrollbars
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
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 '75ce6b103810efbc61af4b786651d9cc414107fd'
* commit '75ce6b103810efbc61af4b786651d9cc414107fd':
Add an API to request a system activity to turn on Bluetooth.
Merge commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded'
* commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0'
* commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0':
Add documentation about flash and change video-light to torch.
Merge commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf'
* commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf':
API XML changes to accompany dalvik.system deprecation.
Merge commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58'
* commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58':
add a optional String to the key of notifications to allow users
NeighboringCellInfo works in GSM and UMTS network.
In GSM network, the locaiton value is the combination of LAC and CID.
In UMTS network, the locaiton value is PSC code.
NeighboringCellInfo should access and store those two values seperately.
It involves the change of Public API.
1. Add new API getRadioType(), getLac(), and getPsc() to get location info in GSM and UMTS.
2. Deprecate setCid() and NeighboringCellInfo(int cid) because cid is set by interpreting network type.
Merge commit 'a7e508eb55c8f63ff43aea2374a2773893e69321'
* commit 'a7e508eb55c8f63ff43aea2374a2773893e69321':
Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Merge commit '80ab1b7198cfad400af752e52541d29ee2f7ce23'
* commit '80ab1b7198cfad400af752e52541d29ee2f7ce23':
Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
Merge commit '919dc7389f7b7558497e766dade90608ac5ef132'
* commit '919dc7389f7b7558497e766dade90608ac5ef132':
Make the new ContactsContract APIs public.
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'
* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
Add support for thumbnails to WallpaperInfo.
