Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Override View.autofill() method and call into ViewDelegate" into oc-dev

Browse Source 
am: c7f474668e

Change-Id: I881a7a6b0b5f471f0981d189d3517886b35a3db6
This commit is contained in:
Tao Bai
2017-03-31 03:04:40 +00:00
committed by android-build-merger
parent e6fd3d4281 c7f474668e
commit b487ff7aa4
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -52721,6 +52721,7 @@ package android.webkit {
} }
public static abstract interface WebViewProvider.ViewDelegate { public static abstract interface WebViewProvider.ViewDelegate {
method public default void autofill(android.util.SparseArray<android.view.autofill.AutofillValue>);
method public abstract boolean dispatchKeyEvent(android.view.KeyEvent); method public abstract boolean dispatchKeyEvent(android.view.KeyEvent);
method public abstract android.view.View findFocus(android.view.View); method public abstract android.view.View findFocus(android.view.View);
method public abstract android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(); method public abstract android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider();

7
core/java/android/webkit/WebView.java
View File

@@ -45,6 +45,7 @@ import android.security.KeyChain;
import android.text.InputType; import android.text.InputType;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.util.SparseArray;
import android.view.DragEvent; import android.view.DragEvent;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
@@ -57,6 +58,7 @@ import android.view.ViewTreeObserver;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider; import android.view.accessibility.AccessibilityNodeProvider;
import android.view.autofill.AutofillValue;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputConnection;
import android.view.textclassifier.TextClassifier; import android.view.textclassifier.TextClassifier;
@@ -2706,6 +2708,11 @@ public class WebView extends AbsoluteLayout
mProvider.getViewDelegate().onProvideAutofillVirtualStructure(structure, flags); mProvider.getViewDelegate().onProvideAutofillVirtualStructure(structure, flags);
} }
@Override
public void autofill(SparseArray<AutofillValue>values) {
mProvider.getViewDelegate().autofill(values);
}
/** @hide */ /** @hide */
@Override @Override
public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {

6
core/java/android/webkit/WebViewProvider.java
View File

@@ -33,6 +33,7 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.print.PrintDocumentAdapter; import android.print.PrintDocumentAdapter;
import android.util.SparseArray;
import android.view.DragEvent; import android.view.DragEvent;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
@@ -41,6 +42,7 @@ import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider; import android.view.accessibility.AccessibilityNodeProvider;
import android.view.autofill.AutofillValue;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputConnection;
import android.view.textclassifier.TextClassifier; import android.view.textclassifier.TextClassifier;
@@ -331,6 +333,10 @@ public interface WebViewProvider {
int flags) { int flags) {
} }
@SuppressWarnings("unused")
public default void autofill(SparseArray<AutofillValue>values) {
}
public AccessibilityNodeProvider getAccessibilityNodeProvider(); public AccessibilityNodeProvider getAccessibilityNodeProvider();
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info); public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info);