26096 Commits

Author SHA1 Message Date
Gilles Debunne
dfad42760f am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp

* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
2010-08-27 10:34:56 -07:00
Gilles Debunne
084dd872b1 am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread
Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp

* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
  Fix for 512 limit in assetManager.list
2010-08-27 10:34:47 -07:00
Gilles Debunne
225ad9cb18 Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 2010-08-27 10:33:17 -07:00
Gilles Debunne
b8fd047311 Merge "Fix for 512 limit in assetManager.list" into gingerbread 2010-08-27 10:32:43 -07:00
Gilles Debunne
45b2d699e1 DO NOT MERGE Text selection: tapping on selection opens context menu
Back key exit selection mode. No more "Stop selecting text" in second context menu.

A tap on one of the handles also triggers the second context menu.

Paste is only available on long press in first menu for empty text fields.

Change-Id: Ic4fa00458d4f617a81885436b53d4fc923347609
2010-08-27 10:29:59 -07:00
Cary Clark
04108437ed am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread
Merge commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c' into gingerbread-plus-aosp

* commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c':
  DO NOT MERGE copy selected text on tap
2010-08-27 08:17:02 -07:00
Cary Clark
c28bf25bc5 Merge "DO NOT MERGE copy selected text on tap" into gingerbread 2010-08-27 08:12:34 -07:00
Brad Fitzpatrick
603a1f5970 am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread
Merge commit 'cc033bd367a445d5e3f8de919cd155505b25274c' into gingerbread-plus-aosp

* commit 'cc033bd367a445d5e3f8de919cd155505b25274c':
  Fix some bugs in SettingsProvider that I introduced the other day.
2010-08-26 17:58:04 -07:00
Brad Fitzpatrick
cc033bd367 Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 2010-08-26 17:54:36 -07:00
Brad Fitzpatrick
3a2952baf1 Fix some bugs in SettingsProvider that I introduced the other day.
BUG=2953979

Change-Id: Ic9813e0ce629c56050d626ed52de67e6ab1ab07e
2010-08-26 17:51:22 -07:00
Eric Rowe
aed5d62ac1 am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
Merge commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a' into gingerbread-plus-aosp

* commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a':
  Improve logging and flexibility of BT stress tests.
2010-08-26 17:37:00 -07:00
Eric Rowe
8f5007ba47 am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
Merge commit '163fba0a75dd582aa62187a062faa66d60db0d34' into gingerbread

* commit '163fba0a75dd582aa62187a062faa66d60db0d34':
  Improve logging and flexibility of BT stress tests.
2010-08-26 17:30:28 -07:00
Eric Rowe
163fba0a75 Merge "Improve logging and flexibility of BT stress tests." into froyo 2010-08-26 17:21:46 -07:00
Gilles Debunne
4d4040b7b3 Fix for 512 limit in assetManager.list
Also replaced all doThrow by jniThrow.

OutOfMemory after string creation were removed: should have been thrown before.

Bug http://b/issue?id=2949164

Change-Id: Idea8e27fdedeb43e3976776c477766e4dcdebcf8
2010-08-26 17:21:43 -07:00
Eric Rowe
e1d666b632 Improve logging and flexibility of BT stress tests.
Change-Id: I657638b3b410175919da545e9a9b7d9df6466362
2010-08-26 15:18:15 -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
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
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
Cary Clark
4e43744301 DO NOT MERGE copy selected text on tap
Change-Id: I4175a3e66cda7f26353fbbd98e65639fd91b2bb9
http://b/2626451
2010-08-26 17:36:01 -04:00
Joe Onorato
8620ed1dd3 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
bc5d9d2254 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
Joe Onorato
246ba1121c Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
Bug: 2827958
Change-Id: I1f9467a2a80fdc1d004a678327a47e7bc8917a18
2010-08-26 16:53:16 -04:00
Andreas Huber
74ae6973f8 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
17a765a139 Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 2010-08-26 13:47:16 -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
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
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