Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'
* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
Fix some bugs in SettingsProvider that I introduced the other day.
MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.
Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
Merge commit '4b4114d155b4f3d5cc4179934cb6403b1776261d'
* commit '4b4114d155b4f3d5cc4179934cb6403b1776261d':
Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.
Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
- Rename ClippedData to ClipData.
- Introudce ClipDescription subclass.
- Add convenience APIs for creating a ClipData.
- Add ClipboardManager API to get just the ClipDescription.
- Define MIME types associated with a clip.
Change-Id: If97ef91aa99a4dd0ec74ccaea504345c9ef12b5c
Turns out we need more ContactsContract APIs to
be unhidden in order to support unbundled directories.
Change-Id: If212e769bb32cd6806e39217935d189f9d43ea67
Merge commit '8620ed1dd3ca13fd80bcd79090840055a34d90db'
* commit '8620ed1dd3ca13fd80bcd79090840055a34d90db':
Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
Merge commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c' into gingerbread-plus-aosp
* commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c':
DO NOT MERGE copy selected text on tap
Merge commit 'cc033bd367a445d5e3f8de919cd155505b25274c' into gingerbread-plus-aosp
* commit 'cc033bd367a445d5e3f8de919cd155505b25274c':
Fix some bugs in SettingsProvider that I introduced the other day.
- You can add arbitrary stuff at the bottom of the header list.
- You can associated an intent with a header to have that launched
when the header is clicked.
- You can change the current header when the header list is rebuilt
after the first time.
Change-Id: I889512beff0c2902a790434e5cde9ce6df74d0c2
Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4'
* commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4':
Support for RTP packets arriving interleaved with RTSP responses.
Merge commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633'
* commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633':
DO NOT MERGE -- copy on tapping outside of selected text in gmail
Merge commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37'
* commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37':
Continue trying to make the turn off quickly after call feature work.
Merge commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d'
* commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d':
Just disable widgets that come from apps on sd cards, because they don't work anyway.
Merge commit '32982c701cee6f73262200468419b80343a0bea7'
* commit '32982c701cee6f73262200468419b80343a0bea7':
Fix typo that makes apps on sd work better with app widgets.
