Commit Graph

20037 Commits

Author SHA1 Message Date
Mathias Agopian
8e4b5a3e6a Add KHR_gl_texture_2D_image extension string. 2010-08-27 16:08:03 -07:00
Mathias Agopian
27e2fac337 cleanup EGL a bit. remove unused extension.
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
2010-08-27 15:30:16 -07:00
Nipun Kwatra
8f136d033c Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
Amith Yamasani
60070c4564 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
543246e0c4 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
daf5d57ab3 Merge "resolved conflicts for merge of 409b7120 to master" 2010-08-27 12:05:45 -07:00
Dianne Hackborn
6a6875aa7a resolved conflicts for merge of 409b7120 to master
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
2010-08-27 12:04:26 -07:00
Wink Saville
443407a081 Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Romain Guy
82f7cf5732 Merge "Apply gamma correction to font rendering." 2010-08-27 11:31:50 -07:00
Chet Haase
2c9b09fa6f Merge "Fix Sequencer end events when terminated early" 2010-08-27 11:15:51 -07:00
Jason parks
261d730905 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
f2d251d579 Merge "Fix MonkeyRunner SDK documentation generation." 2010-08-27 09:10:42 -07:00
Joe Onorato
d127ab20e4 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
Joe Onorato
de39a5be25 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
Dianne Hackborn
f7b610935c Merge "Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work..." 2010-08-26 16:35:10 -07:00
Jaikumar Ganesh
f1919de71f Merge "Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT" 2010-08-26 16:06:04 -07:00
Andreas Huber
23875dd2b1 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
392f707d3f 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
0e5eb83567 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
fcdbed13ef 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
13472a3017 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
69f610ef09 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
ccaf4e1ece 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
c7f89b0712 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
Ben Dodson
3c502cd56d Merge "Updated documentation for upcoming fix for @code tags" 2010-08-26 15:27:15 -07:00
Andreas Huber
0143f6b61d 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
7e3f56abd8 Merge "resolved conflicts for merge of f309c7a8 to master" 2010-08-26 15:07:27 -07:00
Amith Yamasani
f4bfa602c5 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
David Brown
37cc54dd70 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
Gilles Debunne
96ed8973b9 resolved conflicts for merge of f309c7a8 to master
Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3
2010-08-26 14:48:48 -07:00
Dianne Hackborn
ac2d75af2f 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
830227f9b8 Merge "Add WifiStateMachine details for dump" 2010-08-26 14:43:49 -07:00
Jim Miller
e6b86d0c79 Merge "Fix 2797185: Integrate 3D RecentApps View into system." 2010-08-26 14:24:44 -07:00
Chet Haase
39c1357f8d Merge "Fix problems with early ending of Sequencer" 2010-08-26 14:20:01 -07:00
Joe Onorato
2894ee9ed7 am bc5d9d22: Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread
Merge commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f' into gingerbread-plus-aosp

* commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f':
  Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
2010-08-26 13:56:08 -07:00
Joe Onorato
d32b734835 Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread 2010-08-26 13:54:13 -07:00
Andreas Huber
b8d816baa6 am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread
Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp

* commit '17a765a139f5a0b10768937cb11ecd9e7941b039':
  Support for RTP packets arriving interleaved with RTSP responses.
2010-08-26 13:49:32 -07:00
Andreas Huber
c46b7c50c1 Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 2010-08-26 13:47:16 -07:00
Guang Zhu
5b6547cde9 am fe8eaf3b: am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread
Merge commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c'

* commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c':
  add mouse up/down/click support in DumpRenderTree
2010-08-26 13:15:29 -07:00
Dianne Hackborn
cde9a8ab24 am efd05ea6: am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread
Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b'

* commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b':
  Fix issue #2951784: Launcher crashes on startup
2010-08-26 13:15:21 -07:00
Eric Laurent
e071349af8 am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread
Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305'

* commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305':
  Added automated tests for reverb audio effect.
2010-08-26 13:15:09 -07:00
James Dong
6187f4c307 am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
  Make sure that timestamp does not go backward in MP4 file writer
2010-08-26 13:15:00 -07:00
Banavathu, Srinivas Naik
132a019214 am eb182d78: am f3ee6f87: Telephony: Remove references to mExitECMRunnable object.
Merge commit 'eb182d789df75be7a778a6264e658972af73800c'

* commit 'eb182d789df75be7a778a6264e658972af73800c':
  Telephony: Remove references to mExitECMRunnable object.
2010-08-26 13:14:49 -07:00
Robert Greenwalt
dd3b909c7a am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'

* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
  Add an API to request route to an IPv6 host.
2010-08-26 13:14:17 -07:00
Cary Clark
338d568a63 am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread
Merge commit 'ed101933ab7506d841d6eaa7bebda4b674c38088' into gingerbread-plus-aosp

* commit 'ed101933ab7506d841d6eaa7bebda4b674c38088':
  DO NOT MERGE -- copy on tapping outside of selected text in gmail
2010-08-26 12:08:05 -07:00
Joe Onorato
acd9302e28 am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work.
Merge commit '00d1772d8cfb94066b757034055ac38897d161da' into gingerbread-plus-aosp

* commit '00d1772d8cfb94066b757034055ac38897d161da':
  Continue trying to make the turn off quickly after call feature work.
2010-08-26 12:05:54 -07:00
Cary Clark
404860ee66 Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread 2010-08-26 12:04:51 -07:00
Joe Onorato
059e073d52 am 797e688b: 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.
2010-08-26 12:02:51 -07:00
Joe Onorato
4fdd5857bf am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread
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.
2010-08-26 11:55:10 -07:00
Joe Onorato
f3553da915 am cc45381e: Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread
Merge commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6' into gingerbread-plus-aosp

* commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6':
  Fix typo that makes apps on sd work better with app widgets.
2010-08-26 11:54:59 -07:00