Commit Graph

1000 Commits

Author SHA1 Message Date
Derek Sollenberger
3a23a3f367 am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread
Merge commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4'

* commit 'a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4':
  Support pre-loading browser plugins on the system image.
2010-08-30 08:34:23 -07:00
Derek Sollenberger
a3faa923a0 am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp

* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
  Support pre-loading browser plugins on the system image.
2010-08-30 08:06:36 -07:00
Derek Sollenberger
6726d6bb1a Merge "Support pre-loading browser plugins on the system image." into gingerbread 2010-08-30 07:31:46 -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
Derek Sollenberger
de2c49ef48 Support pre-loading browser plugins on the system image.
The shared library from a pre-loaded plugin is in the /system/lib
directory and not in the apps typical data directory. This change
adjust the plugin loading to handle that difference and ensures
that the right library is loaded.

Change-Id: I4337089e40944e77adb6a95afb93cc1d5069511a
http://b/2779728
2010-08-27 11:10:36 -04: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
Ben Dodson
4e8620f868 Updated documentation for upcoming fix for @code tags
Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
2010-08-26 14:02:20 -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
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
Shimeng (Simon) Wang
4ae1f6f2ae Restore zoom level when browser is restored.
issue: 2950667
Change-Id: If335813eed6311d3d01354147bd62f90ffbdacfb
2010-08-26 10:58:38 -07:00
Cary Clark
1ef41605bb am d64f4a98: DO NOT MERGE fix null check
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
2010-08-25 13:53:05 -07:00
Cary Clark
d64f4a983d DO NOT MERGE fix null check
Check to see if the WebChromeClient is null.

Checked into master in change 63008

Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3
http://b/2945171
2010-08-25 16:22:15 -04:00
Cary Clark
e60cb7f914 simplify cursor ring draw state; fix null check
Rename jni call to note that, when pressing the dpad, the
cursor ring is to shown for a short time. The old name suggested
that this was tracking whether the link was followed.

Fix an unrelated change (from gingerbread, automated
merge unlikely to succeed) to check for a null
WebChromeClient.

Requires a companion change in external/webkit

http://b/2135321 (rename jni call)
http://b/2945171 (null check)

Change-Id: I9d4a92dbba1f92da8dc8cde755a2066de59514f9
2010-08-25 16:12:03 -04:00
Cary Clark
75796bbef7 communicate drawing pause to webkit to pause gif animation
Gif frames continue even if the webkit changes aren't drawn.
When we suspend drawing, suspend the gif animation as well.
This is accomplished by fooling webkit into thinking the
browser window is offscreen. When the webkit drawing is
resumed, invalidate the entire content so the gif animations
start up once more.

requires companion change in external/webkit

http://b/2621902

Change-Id: I1814aa41630820872d62752b75ae94383fdcc5fc
2010-08-24 15:36:08 -04:00
Steve Block
bb9db22fbb Hook up device sensors for DeviceOrientation
Change-Id: Ic7165a07a02e3c38165b2f92e3ec7368d2b60e19
2010-08-24 16:33:46 +01:00
Derek Sollenberger
41d5e93bbd Move APK monitoring into WebView.
This CL adds the monitoring logic that was removed from the Browser
in a companion CL.  This allows applications other than the Browser
to use special features offered by YouTube and plugins. Additionally,
the pluginManager was refactored to prevent code duplication between
the manager and WebView.

Change-Id: Ie37f248c8edd9d06ae1fd6675dd5f06f04774b09
http://b/2834603
2010-08-24 09:31:59 -04:00
Kristian Monsen
f52435569c Merge "Java calls to get Android specific files." 2010-08-24 04:50:12 -07:00
Elliott Slaughter
d62847997b Fix WebView saveState and restoreState for private browsing mode.
Change-Id: Ia254ee853d73e56c6f0a5b7762a1cefc1dad0894
2010-08-23 09:59:10 -07:00
Scott Main
385a655b8e am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f'

* commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f':
  docs: add links from widget classes to tutorials
2010-08-21 09:44:53 -07:00
Kristian Monsen
dba35c09e3 Java calls to get Android specific files.
This is needed for https://android-git.corp.google.com/g/#change,62114.

inputStreamForAndroidResource returns an InputStream for a given url
readFromStream is a static method that just reads from a given stream, and catches any exceptions

Change-Id: I4f744bfe851c6d13e16c8eb7f89981cf306d175c
2010-08-20 18:15:45 +01:00
Cary Clark
d93ecb3fab am 581f7861: DO NOT MERGE Refactor find and select dialogs
Merge commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c' into gingerbread-plus-aosp

* commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c':
  DO NOT MERGE Refactor find and select dialogs
2010-08-20 09:33:10 -07:00
Cary Clark
581f78615a DO NOT MERGE Refactor find and select dialogs
(Merged by hand from master, based on
https://android-git.corp.google.com/g/#change,53490 )

In WebView:
- Remove the select mode, so that while text is selected,
the view may respond to scroll or zoom gestures.
- Remove the getFindIsUp() method -- let the host application
track if the dialog is visible.
- Map long press to select text if the host application does
not already intercept it.
- Draw find 'extras' during zoom animation.
- Draw select 'extras' during animation and scrolling as well.
- Distinguish between selecting text and pressing a shift key
(the shift key is still a possible select text shortcut)
- Add more public (but hidden) interfaces: setUpSelect, selectAll, etc.

In WebChromeClient, add interfaces to allow WebView to tell the host
application that selection has started or finished. A long press on
a part of the view that does not trigger a host context menu may
start the selection (if text is underneath the press), and clicking
the trackball or tapping away from the current selection may
end the selection.

Companion changes in external/webkit and packages/apps/Browser

Change-Id: I2d41662acbdb8bdaa8219b35f18a9276e34636a7
http://b/262451
2010-08-20 12:28:19 -04:00
Scott Main
bb8d314b6c am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp

* commit '70c9ffbc838271f0ea27a4780eb146287de53ef6':
  docs: add links from widget classes to tutorials
2010-08-19 17:40:10 -07:00
Scott Main
70c9ffbc83 am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread

* commit '11a72482a0cdc45ceaf4ca83957e682381455aee':
  docs: add links from widget classes to tutorials
2010-08-19 17:37:31 -07:00
Scott Main
41ec65355b docs: add links from widget classes to tutorials
Change-Id: I817e885524951853182b0458df4a32dea1614243
2010-08-19 17:07:13 -07:00
Steve Block
73040de4f6 Merge "Implement DeviceOrientation" 2010-08-19 11:03:57 -07:00
Steve Block
c43565be90 Implement DeviceOrientation
This patch provides all of the plumbing but only provides the error event,
used when we fail to connect to the device's sensors. Connection to the
sensors is coming in a later patch.

Change-Id: I322297d70570425b19917712e63e815651ceacc2
2010-08-19 18:31:57 +01:00
Shimeng (Simon) Wang
0ed2bb5e56 Set the scale to be at least overview zoom scale.
This happens when screen is rotated.  Also removed a not-needed calculation.

issue: 2919307
Change-Id: If24ccb45a488aa8f00fead09206bfbe1799ebcb2
2010-08-19 10:15:50 -07:00
Shimeng (Simon) Wang
c1cba781d3 Use fixed viewpport for tablet device.
This makes the zoom animation much more smooth.  With previous dynamic
viewport, the animation jumps because of viewport adjustment and big
screen.

Also the viewport width is changed from 800 to 1040 to better suit
the tablet device.  It's the middle point of 1280 and 800.

The text reflow re-alignment for non-double-tap zoom is disabled for
tablet, since most of the time the reflow has no effect.

issue: 2919307
Change-Id: I74493df6408291c24ef8511512d7ed0b81bf507a
2010-08-18 12:45:12 -07:00
Leon Scroggins
2aed776142 Change focusController only when WebView gains/loses focus.
Bug: 2582455

A corresponding webkit change eliminates the rest of the calls
to change the active and focused state of the focus controller.

Change-Id: I18868b7480ba5daae71375d109d5a721ecf22b4d
2010-08-18 14:55:18 -04:00
Patrick Scott
8a5d335a55 Use a static variable and methods for the current WebView.
sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2894682
Change-Id: I73de9237ddbbdc55841a9b2639437e26856439c8
2010-08-18 11:00:42 -04:00
Shimeng (Simon) Wang
54038acc8c Update variable to reflect its true value.
The stale value will happen when rotating the large screen and make
double tapping not behave well.

Alternatively, shall we get rid of this variable?

issue: 2919307
Change-Id: I2d71e547db42adeb5674accbf79fb0e7fc587fcd
2010-08-13 15:04:14 -07:00
Shimeng (Simon) Wang
dde858cbb6 Change scale for large screen reading when double tapped.
This happens when default and overview scales have not much difference.

This solves the double tap issue for large screen devices,
where overview and default scale are the same.  The code works well
with phone device as well.

Change-Id: Iac7f66369d58a152de8de7025b326d1672da30d4
2010-08-13 13:52:42 -07:00
Leon Scroggins III
6f99270cbe Hide the soft keyboard even if WebTextView is not in use.
Sometimes clearTextEntry is called when mWebTextView is not
being used.  In those cases, we still want to hide the soft
keyboard, since the user is no longer attempting to type.

Bug: 2835685
Change-Id: I4e8d4bc60b23028e2840d6205caf13699bce6031
2010-08-12 14:45:38 -04:00
Steve Block
d7bfb2dfb8 Merge "Update DeviceOrientationManager to be specific to a WebViewCore" 2010-08-12 06:30:31 -07:00
Patrick Scott
4668e77265 am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize.
Merge commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8'

* commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8':
  Fix npe in getCacheTotalSize.
2010-08-11 07:21:25 -07:00
Patrick Scott
dc1f08586e am 9902196f: Fix npe in getCacheTotalSize.
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp

* commit '9902196f9885d369e37cf44084e3f04513511ab0':
  Fix npe in getCacheTotalSize.
2010-08-11 07:18:27 -07:00
Patrick Scott
9902196f98 Fix npe in getCacheTotalSize.
Bug: 2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
2010-08-11 09:48:43 -04:00
Steve Block
f4a705f045 Update DeviceOrientationManager to be specific to a WebViewCore
This avoids the need to pass the WebViewCore to its methods.

Change-Id: Ieec414f0819f06c8f5568ae5d6dd81a48d05fd6e
2010-08-11 13:14:43 +01:00
Steve Block
68dede3d66 Hook up mock for testing DeviceOrientation in DRT
Change-Id: I99fbe328807428aa0d94893545bad0697ccb71d7
2010-08-10 12:00:35 +01:00
Derek Sollenberger
ff0f973442 Support complex characters in plugins.
Complex characters like chinese are sent via the onKeyMultiple()
callback. The WebView passes these characters to Webkit so that
non-text inputs (e.g. plugins) can process them.

Change-Id: I159c4a404c195b60cc7f63ef4bff0aa80db96c3f
http://b/2900114
2010-08-06 14:05:15 -04:00
Michael Kolb
73980a949d added scroll control support to WebView
Change-Id: Ie0ddaa6b532e31fb0e2904e6bab9d67c06599b66
2010-08-05 16:50:02 -07:00
Elliott Slaughter
f21d2e3059 Initial work on browser incognito mode history feature.
Change-Id: I050edf263d5c4ee0c0373692e267d7e19f47ba1b
2010-08-05 16:22:33 -07:00
Dianne Hackborn
90d5e8c08b Fix build.
Change-Id: I18c0af97c7e204f023cea77e3e5d08eb37596222
2010-08-05 14:28:57 -07:00
Elliott Hughes
0f11696164 Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table.
(Said table is the very same data that used to be, but pushed further down
the dependencies so that it can be shared with java.net.URLConnection, so
the two classes' equivalent methods return the same results.)

Bug: 2422917
Bug: http://code.google.com/p/android/issues/detail?id=10100
Change-Id: Ic4e80c2fede22671e825d569f349e4329dcf01ea
2010-08-02 15:25:16 -07:00
Michael Kolb
37b64de6bc moved target_content user agent parameter to strings
added target content parameter for xlarge screen configuration

Change-Id: I27d252167d4011beec3784addaa548193ba9e20c
2010-07-26 12:58:59 -07:00
Patrick Scott
b77bcd1bb4 Fix gmail crash.
Change-Id: I009d44fce36e365e915b2ecbdfd94fdcee40adf8
2010-07-22 14:01:55 -04:00
Patrick Scott
a3ebcc9d2e Support scrolling divs.
Detect two fingers close together and enter drag layer mode.  Add a
few checks for this mode (mostly to not change the WebView's scroll
position).

Bug: 1566791
Change-Id: I019bb36479884a51c7ca046ca40c05f7c5706b22
2010-07-22 08:16:25 -04:00
Ben Murdoch
f197f19601 Make sure to set a Resource Response on the native side in all cases.
Fix bug: 2847289

Change-Id: Ieda22c201a99b0e3bf307ca1f45b115dd78f7698
2010-07-21 20:44:03 +01:00
Leon Clarke
387b6580b8 Cancel test selections when they start if the client hasn't overridden the
selection behavior.
http://b/issue?id=2847546

Change-Id: I0d8529add54b3dfbf0af239fda1b15edd7bd32e0
2010-07-19 14:36:28 +01:00