Merge "WebView: use proper javadocs" (2c1ff776) · Commits · e / os / android_frameworks_base

core/java/android/webkit/FindActionModeCallback.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
		mActionMode.finish();
		}

		/*
		/**
		* Place text in the text field so it can be searched for. Need to press
		* the find next or find previous button to find all of the matches.
		*/
		@@ -110,7 +110,7 @@ public class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
		}
		}

		/*
		/**
		* Move the highlight to the next match.
		* @param next If {@code true}, find the next match further down in the document.
		* If {@code false}, find the previous match, up in the document.
		@@ -133,7 +133,7 @@ public class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
		updateMatchesString();
		}

		/*
		/**
		* Highlight all the instances of the string from mEditText in mWebView.
		*/
		public void findAll() {
		@@ -172,7 +172,7 @@ public class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
		}
		}

		/*
		/**
		* Update the string which tells the user how many matches were found, and
		* which match is currently highlighted.
		*/

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,12 +16,12 @@

		package android.webkit;

		import com.android.internal.R;

		import android.app.AlertDialog;
		import android.content.Context;
		import android.content.DialogInterface;

		import com.android.internal.R;

		/**
		* Represents a plugin (Java equivalent of the PluginPackageAndroid
		* C++ class in libs/WebKitLib/WebKit/WebCore/plugins/android/)
		@@ -32,13 +32,13 @@ import android.content.DialogInterface;
		*/
		@Deprecated
		public class Plugin {
		/*
		/**
		* @hide
		* @deprecated This interface was intended to be used by Gears. Since Gears was
		* deprecated, so is this class.
		*/
		public interface PreferencesClickHandler {
		/*
		/**
		* @hide
		* @deprecated This interface was intended to be used by Gears. Since Gears was
		* deprecated, so is this class.

+1 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,7 @@ public final class URLUtil {
		Pattern.compile("attachment;\\sfilename\\s=\\s(\"?)([^\"])\\1\\s*$",
		Pattern.CASE_INSENSITIVE);

		/*
		/**
		* Parse the Content-Disposition HTTP Header. The format of the header
		* is defined here: http://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html
		* This header provides a filename for content that is going to be

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package android.webkit;

		import android.content.Context;

		/*
		/**
		* @deprecated The WebSyncManager no longer does anything.
		*/
		@Deprecated