29653 Commits

Author SHA1 Message Date
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
Andreas Huber
0416da73a0 Support for RTP packets arriving interleaved with RTSP responses.
Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
2010-08-26 11:19:08 -07: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
Eric Laurent
dfded35b3a Merge "Added automated tests for reverb audio effect." into gingerbread 2010-08-26 10:16:26 -07:00
James Dong
9509a0ce7e am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer
2010-08-26 09:53:30 -07:00
James Dong
318a759e3c Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 2010-08-26 09:47:12 -07:00
Eric Laurent
391e2d0d88 Added automated tests for reverb audio effect.
- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.

Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
2010-08-26 09:42:49 -07:00
Maksymilian Osowski
6db53149ca Merge "Tweaked the logging + some minor style fixes." 2010-08-26 09:12:09 -07:00
Banavathu, Srinivas Naik
eb182d789d am f3ee6f87: Telephony: Remove references to mExitECMRunnable object.
Merge commit 'f3ee6f87a344b185d8bde12c77440c9020378510' into gingerbread-plus-aosp

* commit 'f3ee6f87a344b185d8bde12c77440c9020378510':
  Telephony: Remove references to mExitECMRunnable object.
2010-08-26 09:02:33 -07:00
Steve Block
9d660cb5f3 Update run_apach2.py to serve HTTP tests at server root
The complete set of layout tests is still available at /LayoutTests
and scripts at /WebKitTools/DumpRenderTree/android.

Note that this requires a corresponding change to
external/webkit/WebKitTools/DumpRenderTree/android/get_layout_tests_dir_contents.php

Bug: 2951727
Change-Id: Idf366942ffd5786759c989e992359b7e7dbb182c
2010-08-26 16:57:17 +01:00
Steve Block
ee273fac7f Use locals to make run_apache2.py more readable
Also fixes style

Change-Id: I8045b7deb5badfed7758be459d05c58d0ff2e390
2010-08-26 16:56:44 +01:00
Maksymilian Osowski
2e5982a55a Tweaked the logging + some minor style fixes.
Change-Id: If89fe8ab1845780ecf23c5fd339a4932ebec9c0c
2010-08-26 16:48:41 +01:00
Robert Greenwalt
4ea54f442e Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
Maksymilian Osowski
da9f91a107 Merge "Updated the script to include access log." 2010-08-26 08:01:58 -07:00
Maksymilian Osowski
fe33f987cb Updated the script to include access log.
Change-Id: I3c97d60580040fa8e4bf63660091edb9c7a871fb
2010-08-26 15:25:02 +01:00
satok
3eeb774c9f am 15edaceb: (-s ours) am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Merge commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6'

* commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
2010-08-26 07:08:55 -07:00
satok
15edaceb2d am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp

* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
2010-08-26 07:01:28 -07:00
satok
913a8925c0 DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Change-Id: Ied15b4f2f447ee3e3b858d4ca65c21c30dfa4eba
2010-08-26 22:53:07 +09:00
Maksymilian Osowski
7f335371dd Merge "Added forwarding service." 2010-08-26 06:21:58 -07:00
Daniel Sandler
e9ddcba348 screenshot command: sound effect, filename incrementing
Change-Id: I0302cda9791f14c23936dbdcce8a70711f65e07d
2010-08-26 09:16:43 -04:00
Maksymilian Osowski
56d7e400ec Added forwarding service.
It creates the sockets on the device that allow DumpRenderTree2 to get tests from the server running on the remote machine. Communication happens through the adb.

Change-Id: I7f26ffc78195b6c5f4d423a57d5ee5f0f4a9c615
2010-08-26 13:38:54 +01:00
Chung-yih Wang
b6d4723aab Revert "Add Wifi High Perf. mode during a call."
This reverts commit 0858806ffcb9ff34725abb79106aa1de27d1bf60.

Change-Id: I0432ac7af6e0becf196728190b71dfe82ce63cd0
2010-08-26 16:37:10 +08:00
Chung-yih Wang
c54f65e61d am cfc3e71e: am 0858806f: Add Wifi High Perf. mode during a call.
Merge commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702'

* commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702':
  Add Wifi High Perf. mode during a call.
2010-08-26 00:26:47 -07:00
Chung-yih Wang
cfc3e71eae am 0858806f: Add Wifi High Perf. mode during a call.
Merge commit '0858806ffcb9ff34725abb79106aa1de27d1bf60' into gingerbread-plus-aosp

* commit '0858806ffcb9ff34725abb79106aa1de27d1bf60':
  Add Wifi High Perf. mode during a call.
2010-08-26 00:24:17 -07:00
Chung-yih Wang
0858806ffc Add Wifi High Perf. mode during a call.
To prevent the wifi from entering low-power mode due to the screen off
triggered by the proximity sensor.

Change-Id: I490bc594d800bc30c256e52ef3bce08bf86bc7b1
2010-08-26 15:05:48 +08:00