Merge commit 'bd2973db0b0c2354b2ca793beed5048e66fbd023'
* commit 'bd2973db0b0c2354b2ca793beed5048e66fbd023':
hide setGammaForText, which is only used for calibrating new devices
Merge commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d'
* commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d':
Remove unused api in QuickContact.java and fix the build.
Merge commit '8167d8d874289c8adf5fbad1ff0790173d7616c1'
* commit '8167d8d874289c8adf5fbad1ff0790173d7616c1':
Update 4.xml with the native status change of breakText/measureText
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
API council says:
"In reviewing the new triggerSearch API, we are concerned that
applications could use the option to perform a global search to spam
the user with frequent searches. We would like the global search
option to be removed for now (not just hidden, but removed from the
internal IPC API so that nobody can find this and abuse it). The rest
of the API should be fine as long as it is restricted to local
searches."
Fixes http://b/editIssue?id=2158785
Change-Id: Ie69a9c0ab6373cc4427aab50606885bdede40585
Stop using SIM card icons for USB notifications
Fixes b/1700510
Change-Id: Ic7e251a7ecad3ed46044181eae41481791df85bd
Signed-off-by: Mike Lockwood <lockwood@android.com>
This change makes sure that ACTV will not take action when an event is
received in a popup that just got dismissed.
This change also makes public two XML attributes of ACTV whose corresponding
Java APIs are public.
This change also fixes a couple of typos.
Change-Id: I78f113bc522d199ff3db44fc4cc3a1882afe822e
Merge commit 'ac18e4f238650aa4bf8b6c7540d928b0249cfd99' into eclair
* commit 'ac18e4f238650aa4bf8b6c7540d928b0249cfd99':
Update 4.xml with the native status change of breakText/measureText
Adds a mechanism to tell Paint the scaling factor its target
canvas will have, for it to compute font metrics based on the
correct font size. Only TextView uses this, but that is enough
for the large majority of apps.
This is integrated from the Eclair branch.
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.
