8213 Commits

Author SHA1 Message Date
Leon Scroggins
7550a9580a Merge "Fix selection off-by-one bug." 2010-05-07 06:14:19 -07:00
Leon Scroggins
6a367f5cb0 Provide a getter to tell the index of the current found match.
Part of fix for bug 2663680

Requires a change to external/webkit.

Change-Id: I1279963cf219eb365dd72262710f87c83acd8c4d
2010-05-07 09:11:09 -04:00
Bjorn Bringert
78531d1b34 am c688d336: am 74612539: am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:47:35 -07:00
Bjorn Bringert
74612539d2 am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken

* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:43:48 -07:00
Bjorn Bringert
c8170ee205 am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp

* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:40:31 -07:00
Bjorn Bringert
75370e7462 Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:37:48 -07:00
Shimeng (Simon) Wang
d3b562ad87 Merge "Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt"" 2010-05-06 20:49:12 -07:00
Shimeng (Simon) Wang
cbeaf2d0ae Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt"
This reverts commit 63b849ef8d6a47422b0f2779f1d9320f6a65d16b.
2010-05-06 20:45:55 -07:00
Doug Felt
0b9d2ca6b6 Fix selection off-by-one bug.
The wrong value was used to measure the width of unidirectional text.

Change-Id: I57752c111641ca1cc951e0647b60c79f5a9493ad
2010-05-06 17:16:31 -07:00
Christopher Tate
10c40078d0 am 5cfec530: am fa9e7c05: Sketch of Native input for MessageQueue / Looper / ViewRoot 2010-05-06 17:10:40 -07:00
Christopher Tate
fa9e7c05c7 Sketch of Native input for MessageQueue / Looper / ViewRoot
MessageQueue now uses a socket for internal signalling, and is prepared
to also handle any number of event input pipes, once the plumbing is
set up with ViewRoot / Looper to tell it about them as appropriate.

Change-Id: If9eda174a6c26887dc51b12b14b390e724e73ab3
2010-05-06 17:00:54 -07:00
Shimeng (Simon) Wang
b0d278fcaa Merge "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt" 2010-05-06 16:17:06 -07:00
Shimeng (Simon) Wang
9b1872e619 Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt
Note: this change doesn't solve the Arabic country code top level domains, which
was turned on today.  For that, more changes need to be done; probably we need a way
to convert the BiDi url to punycode first; then apply this URL pattern.

issue: 2663885
Change-Id: Iac5d16bf9e091a072a59f8244ab6e87940badd4f
2010-05-06 15:38:15 -07:00
Dianne Hackborn
8cc3672095 Merge "New fragment stuff: back stack, and layout integration." 2010-05-06 13:23:10 -07:00
Dianne Hackborn
ba51c3d02d New fragment stuff: back stack, and layout integration.
You can now have fragment transactions pushed on to a local back
stack, which will automatically be popped when the user pressed
back in the activity.

Fragments can also now be inserted into layouts.

Change-Id: Id1c9ae3fbc54f696cd8bb5ca5957bec4d3eabf18
2010-05-06 13:19:35 -07:00
Leon Scroggins III
26723fc89d Adjustments to accommodate changes in Find dialog.
Remove mFindHeight, and the associated adjustements. It
is no longer needed because the FindDialog is no longer
on top of the WebView; instead, the WebView is resized to
accommodate it.
Do not take focus if the user touches the WebView while
Find is up.
Add a (hidden) getter to check to see if Find is showing.

Requires a change to packages/apps/Browser

Change-Id: I08cedb02d29eeeaac6860aa0933ccab43ed5c39f
2010-05-06 11:42:28 -04:00
The Android Open Source Project
108817f3d8 am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master 2010-05-05 18:16:31 -07:00
Dianne Hackborn
7304381ca9 am 110a031a: am f41f444d: Merge "First pass at NativeActivity." into kraken 2010-05-05 17:51:05 -07:00
The Android Open Source Project
579e08e657 am f7896449: merge from open-source master
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown
2010-05-05 16:00:01 -07:00
The Android Open Source Project
f78964490d merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Dianne Hackborn
f41f444d12 Merge "First pass at NativeActivity." into kraken 2010-05-05 15:18:59 -07:00
Dianne Hackborn
69969e48f2 First pass at NativeActivity.
This is a rough sketch of the new pure-native API, which you can
use through a NativeActivity in your manifest (no Java code in
the .apk needed!).

Intentionally no docs yet, the API is still being seriously
messed with.  But it works.

Change-Id: I0e916d58a0d159ecaf3689e41834eb8dc681c0c0
2010-05-05 15:17:26 -07:00
mogimo
b032bc0373 Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
2010-05-05 13:37:21 -07:00
Jean-Michel Trivi
5cb9d13ba7 am fd9b8fb4: am 99fb5046: am fc12b5be: am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." 2010-05-05 12:11:20 -07:00
Jean-Michel Trivi
99fb50468c am fc12b5be: am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346' into kraken

* commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:06:12 -07:00
Jean-Michel Trivi
fc12b5be2e am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9' into froyo-plus-aosp

* commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:03:43 -07:00
Leon Scroggins
9ab32b6642 Enable contentEditable.
WebView.java:
If the cursor and focus are on a contentEditable element, allow it
to handle navigation keys and shift rather than the navigation system.
Also rename method for its new more general use.

WebViewCore.java:
Change the name of MOVE_OUT_OF_PLUGIN to a more generic name, and
fix a bug in the message being sent.

Bug 1788820

Requires a change to external/webkit

Caveats:
Does not ensure that the caret remains on screen.  Frame::revealSelection
is called, but we ignore it for other reasons.  Need to investigate that.
The cursor will blink if the contentEditable node has focus, even if the
user has not clicked on it or has moved to a different input field. Further,
while in this state, the user can input text.

Change-Id: Iaa935363fd324925a1e338418d32f362f58c4494
2010-05-05 14:56:41 -04:00
Dianne Hackborn
67eb751e52 am 9bbc5683: am d9d009d7: am 3445dae3: am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 2010-05-05 11:08:19 -07:00
Bjorn Bringert
66c732f6c7 am 9dc44de5: am b6179a70: am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo 2010-05-05 11:08:09 -07:00
Jaikumar Ganesh
567c0a23d9 am 819a3e22: am c0cec624: Fix runtime reboot when connecting to a A2DP headset and user toggles BT state. 2010-05-05 11:07:40 -07:00
Jaikumar Ganesh
b43f427feb am 1aea42ae: am ca4d4de8: Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-05 11:07:35 -07:00
Scott Main
e446174b98 am d582694c: am ebad36db: am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-05 11:06:58 -07:00
Brian Carlstrom
e103355d93 Remove explicit SSLSocket.startHandshake
When dalvik-dev merges to master, startHandshake will imply that
    the caller wants a fully synchronous handshake instead of using
    handshake cutthrough. This removes an unnecessary startHandshake
    from the CertificateChainValidator.

    	core/java/android/net/http/CertificateChainValidator.java

Change-Id: Ie28abd961a06b28fa780d62b0063371ef4dc1eec
2010-05-05 10:18:04 -07:00
Jean-Michel Trivi
13b18fd7f9 Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
sound.
This CL doesn't fix why mView can be null in the first place, but
prevents a crash when mView is null and a UI sound is to be played.

Change-Id: I74ea03567e8e6ebebb6c95c80a473abf11e1163d
2010-05-05 09:37:41 -07:00
Dianne Hackborn
d9d009d721 am 3445dae3: am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken

* commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:30:51 -07:00
Bjorn Bringert
b6179a7069 am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken

* commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
  Build searchables list after boot
2010-05-04 18:30:47 -07:00
Dianne Hackborn
3445dae3f5 am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp

* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:22:39 -07:00
Bjorn Bringert
0c698e6e78 am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp

* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
  Build searchables list after boot
2010-05-04 18:22:36 -07:00
Joe Onorato
7604f54733 am 6cb9d189: am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated. 2010-05-04 17:46:05 -07:00
Dianne Hackborn
65b2561c3b Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 2010-05-04 17:43:25 -07:00
Dianne Hackborn
4416c3d6e4 Fix issue #2643754: Launcher is caching widget layouts for too long
With the .apk file names now changing during an update, we need
to make sure to flush all caches related to a package when the
package is removed.  Otherwise we can continue to use the old
package, since its old file may still exist if we try to load it
too soon.

Change-Id: I15f08dffca3feac999dbca4f24bef12a30ca0a66
2010-05-04 17:22:49 -07:00
Bjorn Bringert
c9dc10908a Merge "Build searchables list after boot" into froyo 2010-05-04 16:57:56 -07:00
Jaikumar Ganesh
c0cec62454 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: Icf0abeb3dfc794bb3371b1c427aa15755fbe84c7
2010-05-04 15:56:11 -07:00
Jaikumar Ganesh
9997f66f62 Revert "Fix runtime reboot when connecting to a A2DP headset and"
This reverts commit 55b0110fc298c403887b1311d7eabfffa230495f.
2010-05-04 15:52:42 -07:00
Bjorn Bringert
2c7b197a4a Build searchables list after boot
This avoids delaying the first launch of QuickSearchBox or Browser
after boot while SearchManagerService builds the searchables list.

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

Change-Id: Ia510204691ecf487a2008723fe8f6caaced86618
2010-05-04 23:49:24 +01:00
Jaikumar Ganesh
55b0110fc2 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: I023406ec6d59880754ca4f1de676d0dce71b13c6
2010-05-04 15:28:27 -07:00
Jean-Baptiste Queru
f32cdca3cf Merge "Fix for bug 2467152 files with spaces fail to open." 2010-05-04 15:16:32 -07:00
Scott Main
ebad36db56 am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken

* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
  docs: revise and add documentation for backup APIs
2010-05-04 14:22:47 -07:00
Scott Main
5c16039adf am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
2010-05-04 14:21:21 -07:00
Scott Main
014517569f Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00