29574 Commits

Author SHA1 Message Date
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
Gilles Debunne
fc2563ba4e resolved conflicts for merge of f309c7a8 to master
Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3
2010-08-26 14:48:48 -07:00
Irfan Sheriff
8a35996142 Merge "Add WifiStateMachine details for dump" 2010-08-26 14:43:49 -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
Ben Dodson
4e8620f868 Updated documentation for upcoming fix for @code tags
Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
2010-08-26 14:02:20 -07:00
Chet Haase
f1b9b46421 Fix problems with early ending of Sequencer
Change-Id: Ib7548059ee3d3d713b78f86a2d290be4397c167d
2010-08-26 13:59:20 -07:00
Irfan Sheriff
bbc85ab322 Add WifiStateMachine details for dump
Change-Id: I3015411dd11f3df57422b41125d4db44be1e0854
2010-08-26 13:58:35 -07:00
Guang Zhu
ba4da86add 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
5fcfa52d60 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
832aa58a30 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
8c26c127b7 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
1e8dd5b4a7 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
cf7706a83b 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
3a6bfd4cbf 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
03b3de0faf 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
ed101933ab 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
00d1772d8c 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
8f0f1b1e9d 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
32982c701c 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
Cary Clark
8b0b772336 DO NOT MERGE -- copy on tapping outside of selected text in gmail
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
2010-08-26 14:53:57 -04:00
Gilles Debunne
b318ef79d5 am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp

* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
2010-08-26 11:52:44 -07:00
Joe Onorato
274ad9824a Merge "Just disable widgets that come from apps on sd cards, because they don't work anyway." into gingerbread 2010-08-26 11:50:31 -07:00
Joe Onorato
cc45381e59 Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread 2010-08-26 11:50:28 -07:00
Joe Onorato
797e688b3b Continue trying to make the turn off quickly after call feature work.
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
2010-08-26 14:48:56 -04:00
Gilles Debunne
62dbd82aad Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Bug http://b/issue?id=2948904

Change-Id: I10008374da92d5a98ec567cc76732383e66c4c5b
2010-08-26 11:12:16 -07:00
Shimeng (Simon) Wang
b79c271857 Merge "Restore zoom level when browser is restored." 2010-08-26 11:05:48 -07:00
Eric Laurent
d0faf5a2dd am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
  Changed type of reverb presets from int to short
2010-08-26 11:04:01 -07:00
Gilles Debunne
f309c7a869 am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
2010-08-26 11:01:34 -07:00
Eric Laurent
c6d7a8953d Merge "Changed type of reverb presets from int to short" into gingerbread 2010-08-26 11:01:06 -07:00
Gilles Debunne
1b400c7763 Merge "Fix for NPE in TextView." into gingerbread 2010-08-26 10:58:58 -07:00
Shimeng (Simon) Wang
4ae1f6f2ae Restore zoom level when browser is restored.
issue: 2950667
Change-Id: If335813eed6311d3d01354147bd62f90ffbdacfb
2010-08-26 10:58:38 -07:00
Guang Zhu
fe8eaf3b5d am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp

* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
  add mouse up/down/click support in DumpRenderTree
2010-08-26 10:52:27 -07:00
Dianne Hackborn
efd05ea69a am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
2010-08-26 10:50:11 -07:00
Guang Zhu
1c04500378 Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 2010-08-26 10:49:19 -07:00
Dianne Hackborn
0a7f5fc474 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Eric Laurent
71450f8139 Changed type of reverb presets from int to short
Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.

Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
2010-08-26 10:42:38 -07:00
Dianne Hackborn
9dae48e399 Fix issue #2951784: Launcher crashes on startup
Change-Id: I98aedacce9a7d6b8bc168f39ea5489b40dc0ec8d
2010-08-26 10:20:01 -07:00
Eric Laurent
2db7330578 am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread
Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp

* commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a':
  Added automated tests for reverb audio effect.
2010-08-26 10:19:23 -07:00