Merge "AutoFill Framework refactoring." (d4f08a00) · Commits · e / os / android_frameworks_base

api/current.txt

+15 −4

Original line number	Diff line number	Diff line
		@@ -34877,7 +34877,8 @@ package android.service.autofill {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onConnected();
		method public void onDisconnected();
		method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.CancellationSignal, android.service.autofill.FillCallback);
		method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, android.os.CancellationSignal, android.service.autofill.FillCallback);
		method public abstract void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.os.CancellationSignal, android.service.autofill.SaveCallback);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutoFillService";
		}

		@@ -34895,6 +34896,11 @@ package android.service.autofill {
		method public android.service.autofill.FillCallback.FillData.Builder setTextField(int, java.lang.String);
		}

		public final class SaveCallback {
		method public void onFailure(java.lang.CharSequence);
		method public void onSuccess(int[]);
		}

		}

		package android.service.carrier {
		@@ -42968,7 +42974,8 @@ package android.view {
		method public boolean dispatchNestedPreScroll(int, int, int[], int[]);
		method public boolean dispatchNestedScroll(int, int, int, int, int[]);
		method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void dispatchProvideStructure(android.view.ViewStructure);
		method public deprecated void dispatchProvideStructure(android.view.ViewStructure);
		method public void dispatchProvideStructure(android.view.ViewStructure, int);
		method protected void dispatchRestoreInstanceState(android.util.SparseArray<android.os.Parcelable>);
		method protected void dispatchSaveInstanceState(android.util.SparseArray<android.os.Parcelable>);
		method protected void dispatchSetActivated(boolean);
		@@ -43234,8 +43241,10 @@ package android.view {
		method protected void onMeasure(int, int);
		method protected void onOverScrolled(int, int, boolean, boolean);
		method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void onProvideStructure(android.view.ViewStructure);
		method public void onProvideVirtualStructure(android.view.ViewStructure);
		method public deprecated void onProvideStructure(android.view.ViewStructure);
		method public void onProvideStructure(android.view.ViewStructure, int);
		method public deprecated void onProvideVirtualStructure(android.view.ViewStructure);
		method public void onProvideVirtualStructure(android.view.ViewStructure, int);
		method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);
		method protected void onRestoreInstanceState(android.os.Parcelable);
		method public void onRtlPropertiesChanged(int);
		@@ -43437,6 +43446,8 @@ package android.view {
		field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
		field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
		field public static final android.util.Property<android.view.View, java.lang.Float> ALPHA;
		field public static final int ASSIST_FLAG_NON_SANITIZED_TEXT = 2; // 0x2
		field public static final int ASSIST_FLAG_SANITIZED_TEXT = 1; // 0x1
		field public static final int DRAG_FLAG_GLOBAL = 256; // 0x100
		field public static final int DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION = 64; // 0x40
		field public static final int DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION = 128; // 0x80

api/system-current.txt

+16 −4

Original line number	Diff line number	Diff line
		@@ -37714,7 +37714,8 @@ package android.service.autofill {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onConnected();
		method public void onDisconnected();
		method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.CancellationSignal, android.service.autofill.FillCallback);
		method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, android.os.CancellationSignal, android.service.autofill.FillCallback);
		method public abstract void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.os.CancellationSignal, android.service.autofill.SaveCallback);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutoFillService";
		}

		@@ -37732,6 +37733,11 @@ package android.service.autofill {
		method public android.service.autofill.FillCallback.FillData.Builder setTextField(int, java.lang.String);
		}

		public final class SaveCallback {
		method public void onFailure(java.lang.CharSequence);
		method public void onSuccess(int[]);
		}

		}

		package android.service.carrier {
		@@ -46160,7 +46166,8 @@ package android.view {
		method public boolean dispatchNestedPreScroll(int, int, int[], int[]);
		method public boolean dispatchNestedScroll(int, int, int, int, int[]);
		method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void dispatchProvideStructure(android.view.ViewStructure);
		method public deprecated void dispatchProvideStructure(android.view.ViewStructure);
		method public void dispatchProvideStructure(android.view.ViewStructure, int);
		method protected void dispatchRestoreInstanceState(android.util.SparseArray<android.os.Parcelable>);
		method protected void dispatchSaveInstanceState(android.util.SparseArray<android.os.Parcelable>);
		method protected void dispatchSetActivated(boolean);
		@@ -46426,8 +46433,10 @@ package android.view {
		method protected void onMeasure(int, int);
		method protected void onOverScrolled(int, int, boolean, boolean);
		method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void onProvideStructure(android.view.ViewStructure);
		method public void onProvideVirtualStructure(android.view.ViewStructure);
		method public deprecated void onProvideStructure(android.view.ViewStructure);
		method public void onProvideStructure(android.view.ViewStructure, int);
		method public deprecated void onProvideVirtualStructure(android.view.ViewStructure);
		method public void onProvideVirtualStructure(android.view.ViewStructure, int);
		method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);
		method protected void onRestoreInstanceState(android.os.Parcelable);
		method public void onRtlPropertiesChanged(int);
		@@ -46629,6 +46638,8 @@ package android.view {
		field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
		field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
		field public static final android.util.Property<android.view.View, java.lang.Float> ALPHA;
		field public static final int ASSIST_FLAG_NON_SANITIZED_TEXT = 2; // 0x2
		field public static final int ASSIST_FLAG_SANITIZED_TEXT = 1; // 0x1
		field public static final int DRAG_FLAG_GLOBAL = 256; // 0x100
		field public static final int DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION = 64; // 0x40
		field public static final int DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION = 128; // 0x80
		@@ -49999,6 +50010,7 @@ package android.webkit {
		method public abstract void onMeasure(int, int);
		method public abstract void onOverScrolled(int, int, boolean, boolean);
		method public abstract void onProvideVirtualStructure(android.view.ViewStructure);
		method public default void onProvideVirtualStructure(android.view.ViewStructure, int);
		method public abstract void onScrollChanged(int, int, int, int);
		method public abstract void onSizeChanged(int, int, int, int);
		method public abstract void onStartTemporaryDetach();

api/test-current.txt

+15 −4

Original line number	Diff line number	Diff line
		@@ -34974,7 +34974,8 @@ package android.service.autofill {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onConnected();
		method public void onDisconnected();
		method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.CancellationSignal, android.service.autofill.FillCallback);
		method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, android.os.CancellationSignal, android.service.autofill.FillCallback);
		method public abstract void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.os.CancellationSignal, android.service.autofill.SaveCallback);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutoFillService";
		}

		@@ -34992,6 +34993,11 @@ package android.service.autofill {
		method public android.service.autofill.FillCallback.FillData.Builder setTextField(int, java.lang.String);
		}

		public final class SaveCallback {
		method public void onFailure(java.lang.CharSequence);
		method public void onSuccess(int[]);
		}

		}

		package android.service.carrier {
		@@ -43236,7 +43242,8 @@ package android.view {
		method public boolean dispatchNestedPreScroll(int, int, int[], int[]);
		method public boolean dispatchNestedScroll(int, int, int, int, int[]);
		method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void dispatchProvideStructure(android.view.ViewStructure);
		method public deprecated void dispatchProvideStructure(android.view.ViewStructure);
		method public void dispatchProvideStructure(android.view.ViewStructure, int);
		method protected void dispatchRestoreInstanceState(android.util.SparseArray<android.os.Parcelable>);
		method protected void dispatchSaveInstanceState(android.util.SparseArray<android.os.Parcelable>);
		method protected void dispatchSetActivated(boolean);
		@@ -43503,8 +43510,10 @@ package android.view {
		method protected void onMeasure(int, int);
		method protected void onOverScrolled(int, int, boolean, boolean);
		method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void onProvideStructure(android.view.ViewStructure);
		method public void onProvideVirtualStructure(android.view.ViewStructure);
		method public deprecated void onProvideStructure(android.view.ViewStructure);
		method public void onProvideStructure(android.view.ViewStructure, int);
		method public deprecated void onProvideVirtualStructure(android.view.ViewStructure);
		method public void onProvideVirtualStructure(android.view.ViewStructure, int);
		method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);
		method protected void onRestoreInstanceState(android.os.Parcelable);
		method public void onRtlPropertiesChanged(int);
		@@ -43706,6 +43715,8 @@ package android.view {
		field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
		field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
		field public static final android.util.Property<android.view.View, java.lang.Float> ALPHA;
		field public static final int ASSIST_FLAG_NON_SANITIZED_TEXT = 2; // 0x2
		field public static final int ASSIST_FLAG_SANITIZED_TEXT = 1; // 0x1
		field public static final int DRAG_FLAG_GLOBAL = 256; // 0x100
		field public static final int DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION = 64; // 0x40
		field public static final int DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION = 128; // 0x80

core/java/android/app/Activity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1738,8 +1738,8 @@ public class Activity extends ContextThemeWrapper
		FillableInputField autoFillField = (FillableInputField) field;
		final int viewId = autoFillField.getId();
		final View view = root.findViewByAccessibilityIdTraversal(viewId);
		// TODO: should handle other types of view as well, but that will
		// require:
		// TODO(b/33197203): should handle other types of view as well, but
		// that will require:
		// - a new interface like AutoFillable
		// - a way for the views to define the type of the autofield value
		if ((view instanceof EditText)) {
		@@ -1752,7 +1752,7 @@ public class Activity extends ContextThemeWrapper
		@Override
		public void showError(String message) {
		runOnUiThread(() -> {
		// TODO: temporary show a toast until it uses the Snack bar.
		// TODO(b/33197203): temporary show a toast until it uses the Snack bar.
		Toast.makeText(Activity.this, "Auto-fill request failed: " + message,
		Toast.LENGTH_LONG).show();
		});

core/java/android/app/ActivityManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -450,9 +450,6 @@ public class ActivityManager {
		/** @hide requestType for assist context: generate full AssistStructure. */
		public static final int ASSIST_CONTEXT_FULL = 1;

		/** @hide requestType for assist context: generate full AssistStructure for auto-fill. */
		public static final int ASSIST_CONTEXT_AUTOFILL = 2;

		/** @hide Flag for registerUidObserver: report changes in process state. */
		public static final int UID_OBSERVER_PROCSTATE = 1<<0;