29615 Commits

Author SHA1 Message Date
Nipun Kwatra
cf66e47ddd Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
Nipun Kwatra
f83cba77b6 Added MediaSourceSplitter to split single source to multiple ones.
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
2010-08-27 13:46:41 -07:00
Joe Onorato
3fec2bf9bf Clean up the mess
Change-Id: Id3745d6e97d90443dcc0fd29fa047090c489adb3
2010-08-27 15:34:00 -04:00
Amith Yamasani
f956fd6d13 am 4b4114d1: am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text.
Merge commit '4b4114d155b4f3d5cc4179934cb6403b1776261d'

* commit '4b4114d155b4f3d5cc4179934cb6403b1776261d':
  Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
2010-08-27 12:14:46 -07:00
David Brown
93637d3ee7 am b4298cd8: am 846eb30f: Add SipAddress to ContactsContract.
Merge commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c'

* commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c':
  Add SipAddress to ContactsContract.
2010-08-27 12:14:13 -07:00
Dianne Hackborn
0430dcf174 Merge "resolved conflicts for merge of 409b7120 to master" 2010-08-27 12:05:45 -07:00
Dianne Hackborn
41bfa37cb2 resolved conflicts for merge of 409b7120 to master
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
2010-08-27 12:04:26 -07:00
Wink Saville
db4c91ff7b Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Romain Guy
3750f64dce Merge "Apply gamma correction to font rendering." 2010-08-27 11:31:50 -07:00
Romain Guy
b45c0c9774 Apply gamma correction to font rendering.
Change-Id: I1b05f40e356221b2a5eb9400e67d77ecd98ed6c4
2010-08-27 11:31:24 -07:00
Chet Haase
d970432538 Merge "Fix Sequencer end events when terminated early" 2010-08-27 11:15:51 -07:00
Wink Saville
1f6408a96c Add NetworkProperties to DataConnection.
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.

Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
2010-08-27 11:15:18 -07:00
Dianne Hackborn
1040dc465c Improve clipboard API.
- 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
2010-08-27 11:06:01 -07:00
Dmitri Plotnikov
59024f1697 Unhinding more ContactsContract APIs.
Turns out we need more ContactsContract APIs to
be unhidden in order to support unbundled directories.

Change-Id: If212e769bb32cd6806e39217935d189f9d43ea67
2010-08-27 10:59:22 -07:00
Jason parks
e73d10c6fb Merge "Deprecated the managed cursor API's on Activity. Loaders are the new world order." 2010-08-27 09:28:21 -07:00
Bill Napier
db53e0ef66 Merge "Fix MonkeyRunner SDK documentation generation." 2010-08-27 09:10:42 -07:00
Joe Onorato
c303299198 Merge "Hand merge bc5d9d22: Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into master" 2010-08-27 08:46:04 -07:00
Chet Haase
1e0ac5a106 Fix Sequencer end events when terminated early
Change-Id: I3e10d17000182419219dbd1243d42cd0ecda7aa0
2010-08-27 08:36:59 -07:00
Joe Onorato
8deae99ba1 am 8620ed1d: (-s ours) am bc5d9d22: Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread
Merge commit '8620ed1dd3ca13fd80bcd79090840055a34d90db'

* commit '8620ed1dd3ca13fd80bcd79090840055a34d90db':
  Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
2010-08-27 08:28:33 -07:00
Joe Onorato
88e517ec71 Hand merge bc5d9d22: Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into
master

Change-Id: I4e42155d231f92893c48ffe911e3dfce9d70eb49
2010-08-27 11:21:26 -04:00
Jason parks
6ed50de6d1 Deprecated the managed cursor API's on Activity. Loaders are the new world order.
Change-Id: I0c7d403e9e6c0fcdf6fea886d8c284341e2f6c88
2010-08-27 09:29:15 -05:00
Dianne Hackborn
5c769a47ae Some new preferences features.
- 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
2010-08-26 17:43:49 -07:00
Ben Dodson
58a345936d Added methods for managing uri query parameters
Change-Id: Ic98c1bd159740dd4d895889079f9f2abae4fc2b9
2010-08-26 17:15:01 -07:00
Dianne Hackborn
363e035f5f Merge "Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work..." 2010-08-26 16:35:10 -07:00
Jaikumar Ganesh
eb3c544234 Merge "Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT" 2010-08-26 16:06:04 -07:00
Jaikumar Ganesh
4e25533945 Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT
Change-Id: I5405b57f5815fa91ffce829dec6da3e4b7f1245f
2010-08-26 16:03:40 -07:00
Dianne Hackborn
5f36c96f6d Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work...
...when it is called before the parent Activity becomes ready.

Change-Id: Id021564ebb3419353234e459b7358b9a72660715
2010-08-26 15:56:59 -07:00
Andreas Huber
178e1d0a59 am 74ae6973: am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread
Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4'

* commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4':
  Support for RTP packets arriving interleaved with RTSP responses.
2010-08-26 15:52:40 -07:00
Cary Clark
251d1bbb26 am 3a6bfd4c: (-s ours) am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread
Merge commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633'

* commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633':
  DO NOT MERGE -- copy on tapping outside of selected text in gmail
2010-08-26 15:52:24 -07:00
Joe Onorato
1578bf1090 am 03b3de0f: am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work.
Merge commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37'

* commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37':
  Continue trying to make the turn off quickly after call feature work.
2010-08-26 15:52:13 -07:00
Joe Onorato
267f4d6a22 am 8f0f1b1e: am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread
Merge commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d'

* commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d':
  Just disable widgets that come from apps on sd cards, because they don't work anyway.
2010-08-26 15:52:07 -07:00
Joe Onorato
0add80b454 am 32982c70: am cc45381e: Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread
Merge commit '32982c701cee6f73262200468419b80343a0bea7'

* commit '32982c701cee6f73262200468419b80343a0bea7':
  Fix typo that makes apps on sd work better with app widgets.
2010-08-26 15:52:01 -07:00
Gilles Debunne
511d444be0 am b318ef79: am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Merge commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c'

* commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
2010-08-26 15:51:56 -07:00
Eric Laurent
0a84244d92 am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread
Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'

* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
  Changed type of reverb presets from int to short
2010-08-26 15:51:37 -07:00
Adam Cohen
4252a5a4b4 Merge "-> Added the ability to specify an AdapterView's empty view 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" 2010-08-26 15:41:59 -07:00
Adam Cohen
1480fddea8 -> Added the ability to specify an AdapterView's empty view
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
2010-08-26 15:28:05 -07:00
Ben Dodson
e3f55d45cf Merge "Updated documentation for upcoming fix for @code tags" 2010-08-26 15:27:15 -07:00
Andreas Huber
8ed880d776 Merge "Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster." 2010-08-26 15:20:31 -07:00
Gilles Debunne
deefe55322 Merge "resolved conflicts for merge of f309c7a8 to master" 2010-08-26 15:07:27 -07:00
Amith Yamasani
4b4114d155 am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text.
Merge commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071' into gingerbread-plus-aosp

* commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071':
  Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
2010-08-26 14:57:31 -07:00
Amith Yamasani
a90b7f0125 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
2010-08-26 14:53:39 -07:00
David Brown
b4298cd8ba am 846eb30f: Add SipAddress to ContactsContract.
Merge commit '846eb30f78a9153102c743c2c1b49de1a4079fb1' into gingerbread-plus-aosp

* commit '846eb30f78a9153102c743c2c1b49de1a4079fb1':
  Add SipAddress to ContactsContract.
2010-08-26 14:52:10 -07:00
David Brown
846eb30f78 Add SipAddress to ContactsContract.
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
2010-08-26 14:49:29 -07:00
Gilles Debunne
fc2563ba4e resolved conflicts for merge of f309c7a8 to master
Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3
2010-08-26 14:48:48 -07:00
Dianne Hackborn
409b71201a am 02486b13: Hide heavy-weight API.
Merge commit '02486b1327e3007c62d253dd89ba9db1852b87f8' into gingerbread-plus-aosp

* commit '02486b1327e3007c62d253dd89ba9db1852b87f8':
  Hide heavy-weight API.
2010-08-26 14:46:43 -07:00
Irfan Sheriff
8a35996142 Merge "Add WifiStateMachine details for dump" 2010-08-26 14:43:49 -07:00
Dianne Hackborn
02486b1327 Hide heavy-weight API.
And give it a better name, for when it is later un-hidden.

Change-Id: Iae0d3054d44f873b9f953bc41d175a47802a185e
2010-08-26 14:41:58 -07:00
Andreas Huber
d222c84047 Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster.
Change-Id: Ia41194752ef72feb4ed1d5199e97b1649075b646
2010-08-26 14:33:09 -07:00
Jim Miller
c70bd1921b Merge "Fix 2797185: Integrate 3D RecentApps View into system." 2010-08-26 14:24:44 -07:00
Chet Haase
d7c2f623fe Merge "Fix problems with early ending of Sequencer" 2010-08-26 14:20:01 -07:00