Merge "Unhide the file API" (527a293c) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -35188,12 +35188,25 @@ package android.webkit {
		method public void onRequestFocus(android.webkit.WebView);
		method public void onShowCustomView(android.view.View, android.webkit.WebChromeClient.CustomViewCallback);
		method public deprecated void onShowCustomView(android.view.View, int, android.webkit.WebChromeClient.CustomViewCallback);
		method public boolean showFileChooser(android.webkit.WebView, android.webkit.ValueCallback<android.net.Uri[]>, android.webkit.WebChromeClient.FileChooserParams);
		}

		public static abstract interface WebChromeClient.CustomViewCallback {
		method public abstract void onCustomViewHidden();
		}

		public static class WebChromeClient.FileChooserParams {
		ctor public WebChromeClient.FileChooserParams();
		field public static final int MODE_OPEN_FOLDER = 2; // 0x2
		field public static final int MODE_OPEN_MULTIPLE = 1; // 0x1
		field public static final int MODE_SAVE = 4; // 0x4
		field public java.lang.String acceptTypes;
		field public boolean capture;
		field public java.lang.String defaultFilename;
		field public int mode;
		field public java.lang.String title;
		}

		public class WebHistoryItem implements java.lang.Cloneable {
		method public android.graphics.Bitmap getFavicon();
		method public java.lang.String getOriginalUrl();

+1 −5

Original line number	Diff line number	Diff line
		@@ -408,7 +408,6 @@ public class WebChromeClient {
		* @return true if filePathCallback will be invoked, false to use default handling.
		*
		* @see FileChooserParams
		* @hide For API approval
		*/
		public boolean showFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback,
		FileChooserParams fileChooserParams) {
		@@ -416,11 +415,8 @@ public class WebChromeClient {
		}

		/**
		* Parameters used in the {@link #showFileChooser(WebView,ValueCallback<String[]>,FileChooserParams)}
		* method.
		*
		* Parameters used in the {@link #showFileChooser} method.
		* This is intended to be used as a read-only data struct by the application.
		* @hide For API approval
		*/
		public static class FileChooserParams {
		// Flags for mode