Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'
* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
Changed type of reverb presets from int to short
through RemoteViews. An empty view is the view that appears
in lieu of the collection when the collection is empty.
-> Made StackViews start at their last item
Change-Id: Ica44e5e8f8f2a2e5589a6c74414ec4d08303887f
Merge commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071' into gingerbread-plus-aosp
* commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071':
Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
to return the selected text.
setComposingRegion:
The TextView may choose to highlight the text in some way (underline for now) to indicate
that the text is selected for correction, if the IME wants to provider alternatives.
Choosing an alternative in the IME can then call IC.commitText() to replace the highlighted
(not selected) text with a different candidate.
This change also ensures that any existing spans/styles are not wiped out. So we can now
correct rich text as well.
getSelectedText:
This is a convenience to get the selected text instead of using extracted text that is
more heavy weight. Existing getTextBeforeCursor() and getTextAfterCursor() fail to
retrieve the selected text, only what's before and after the selection.
Change-Id: Ieb5ecd5ff947ea04958589f501e7bd5228e00fb5
This is a new data kind representing a SIP address for a contact.
The new class is ContactsContract.CommonDataKinds.SipAddress,
and the new mime type is "vnd.android.cursor.item/sip_address".
It's pretty generic right now (basically a single text field, like
"Website") but we may eventually want to extend it later to have multiple
labels+types (like phone numbers.)
Bug: 2942998
Change-Id: I45d90a680a3badf60bccb5aafdc2397037494e95
Merge commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f' into gingerbread-plus-aosp
* commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f':
Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp
* commit '17a765a139f5a0b10768937cb11ecd9e7941b039':
Support for RTP packets arriving interleaved with RTSP responses.
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'
* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
Make sure that timestamp does not go backward in MP4 file writer
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'
* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
Add an API to request route to an IPv6 host.
Merge commit 'ed101933ab7506d841d6eaa7bebda4b674c38088' into gingerbread-plus-aosp
* commit 'ed101933ab7506d841d6eaa7bebda4b674c38088':
DO NOT MERGE -- copy on tapping outside of selected text in gmail
Merge commit '00d1772d8cfb94066b757034055ac38897d161da' into gingerbread-plus-aosp
* commit '00d1772d8cfb94066b757034055ac38897d161da':
Continue trying to make the turn off quickly after call feature work.
Merge commit '797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread
* commit '797e688b3bebbf1f50a8ad08528740b064f79153':
Continue trying to make the turn off quickly after call feature work.
Merge commit '274ad9824a20b61dfbb785621567fd0414a965a4' into gingerbread-plus-aosp
* commit '274ad9824a20b61dfbb785621567fd0414a965a4':
Just disable widgets that come from apps on sd cards, because they don't work anyway.
Merge commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6' into gingerbread-plus-aosp
* commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6':
Fix typo that makes apps on sd work better with app widgets.
Text can be selected in gmail by choosing Select Text from the
menu and dragging the selection. There's no pretend action bar
like there is in the Browser to commit the selection.
When tapping outside of the selection, copy the text, if
the client (like gmail) has mapped the trackball to the
arrow keys.
Change-Id: I7dd133fd860d392bb01ec103e379e1f1d2a43e64
http://b/2626451
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp
* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
Fix for IndexOutOfBounds in TextView getWordLimitsAt.
The previous implementation worked if the set timeout is short enough, which mine was. This one
carries the remaining amount of timeout override forward through all of the countdown steps.
Bug: 2844990
Change-Id: I040df22f9f9ddf98c355ac6845b7624e95f84f33
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp
* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
Changed type of reverb presets from int to short
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp
* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
Fix for NPE in TextView.