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

Merge "Notifying the on-device intelligence service when view window insets have changed" into rvc-dev

Browse Source
This commit is contained in:
Mihir Patel
2020-03-13 21:02:15 +00:00
committed by Android (Google) Code Review
parent 5f003f4e10 b73c421753
commit a5efb2c838
10 changed files with 114 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -56741,6 +56741,7 @@ package android.view.contentcapture {
method public final void notifySessionResumed();
method public final void notifyViewAppeared(@NonNull android.view.ViewStructure);
method public final void notifyViewDisappeared(@NonNull android.view.autofill.AutofillId);
method public final void notifyViewInsetsChanged(@NonNull android.graphics.Insets);
method public final void notifyViewTextChanged(@NonNull android.view.autofill.AutofillId, @Nullable CharSequence);
method public final void notifyViewsDisappeared(@NonNull android.view.autofill.AutofillId, @NonNull long[]);
method public final void setContentCaptureContext(@Nullable android.view.contentcapture.ContentCaptureContext);

2
api/system-current.txt
View File

@@ -13191,6 +13191,7 @@ package android.view.contentcapture {
method public long getEventTime();
method @Nullable public android.view.autofill.AutofillId getId();
method @Nullable public java.util.List<android.view.autofill.AutofillId> getIds();
method @Nullable public android.graphics.Insets getInsets();
method @Nullable public CharSequence getText();
method public int getType();
method @Nullable public android.view.contentcapture.ViewNode getViewNode();
@@ -13201,6 +13202,7 @@ package android.view.contentcapture {
field public static final int TYPE_SESSION_RESUMED = 7; // 0x7
field public static final int TYPE_VIEW_APPEARED = 1; // 0x1
field public static final int TYPE_VIEW_DISAPPEARED = 2; // 0x2
field public static final int TYPE_VIEW_INSETS_CHANGED = 9; // 0x9
field public static final int TYPE_VIEW_TEXT_CHANGED = 3; // 0x3
field public static final int TYPE_VIEW_TREE_APPEARED = 5; // 0x5
field public static final int TYPE_VIEW_TREE_APPEARING = 4; // 0x4

2
api/test-current.txt
View File

@@ -5085,6 +5085,7 @@ package android.view.contentcapture {
method public long getEventTime();
method @Nullable public android.view.autofill.AutofillId getId();
method @Nullable public java.util.List<android.view.autofill.AutofillId> getIds();
method @Nullable public android.graphics.Insets getInsets();
method @Nullable public CharSequence getText();
method public int getType();
method @Nullable public android.view.contentcapture.ViewNode getViewNode();
@@ -5095,6 +5096,7 @@ package android.view.contentcapture {
field public static final int TYPE_SESSION_RESUMED = 7; // 0x7
field public static final int TYPE_VIEW_APPEARED = 1; // 0x1
field public static final int TYPE_VIEW_DISAPPEARED = 2; // 0x2
field public static final int TYPE_VIEW_INSETS_CHANGED = 9; // 0x9
field public static final int TYPE_VIEW_TEXT_CHANGED = 3; // 0x3
field public static final int TYPE_VIEW_TREE_APPEARED = 5; // 0x5
field public static final int TYPE_VIEW_TREE_APPEARING = 4; // 0x4

35
core/java/android/view/View.java
View File

@@ -29099,8 +29099,33 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mTreeObserver = new ViewTreeObserver(context);
}
@Nullable
ContentCaptureManager getContentCaptureManager(@NonNull Context context) {
if (mContentCaptureManager != null) {
return mContentCaptureManager;
}
mContentCaptureManager = context.getSystemService(ContentCaptureManager.class);
return mContentCaptureManager;
}
void delayNotifyContentCaptureInsetsEvent(@NonNull Insets insets) {
if (mContentCaptureManager == null) {
return;
}
ArrayList<Object> events = ensureEvents(
mContentCaptureManager.getMainContentCaptureSession());
events.add(insets);
}
private void delayNotifyContentCaptureEvent(@NonNull ContentCaptureSession session,
@NonNull View view, boolean appeared) {
ArrayList<Object> events = ensureEvents(session);
events.add(appeared ? view : view.getAutofillId());
}
@NonNull
private ArrayList<Object> ensureEvents(@NonNull ContentCaptureSession session) {
if (mContentCaptureEvents == null) {
// Most of the time there will be just one session, so intial capacity is 1
mContentCaptureEvents = new SparseArray<>(1);
@@ -29112,16 +29137,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
events = new ArrayList<>();
mContentCaptureEvents.put(sessionId, events);
}
events.add(appeared ? view : view.getAutofillId());
}
@Nullable
ContentCaptureManager getContentCaptureManager(@NonNull Context context) {
if (mContentCaptureManager != null) {
return mContentCaptureManager;
}
mContentCaptureManager = context.getSystemService(ContentCaptureManager.class);
return mContentCaptureManager;
return events;
}
}

4
core/java/android/view/ViewRootImpl.java
View File

@@ -81,6 +81,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.FrameInfo;
import android.graphics.HardwareRenderer.FrameDrawingCallback;
import android.graphics.Insets;
import android.graphics.Matrix;
import android.graphics.PixelFormat;
import android.graphics.Point;
@@ -2254,6 +2255,7 @@ public final class ViewRootImpl implements ViewParent,
insets = insets.consumeDisplayCutout();
}
host.dispatchApplyWindowInsets(insets);
mAttachInfo.delayNotifyContentCaptureInsetsEvent(insets.getInsets(Type.all()));
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
}
@@ -3118,6 +3120,8 @@ public final class ViewRootImpl implements ViewParent,
ViewStructure structure = session.newViewStructure(view);
view.onProvideContentCaptureStructure(structure, /* flags= */ 0);
session.notifyViewAppeared(structure);
} else if (event instanceof Insets) {
mainSession.notifyViewInsetsChanged(sessionId, (Insets) event);
} else {
Log.w(mTag, "invalid content capture event: " + event);
}

6
core/java/android/view/contentcapture/ChildContentCaptureSession.java
View File

@@ -17,6 +17,7 @@ package android.view.contentcapture;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.graphics.Insets;
import android.view.autofill.AutofillId;
import android.view.contentcapture.ViewNode.ViewStructureImpl;
@@ -83,6 +84,11 @@ final class ChildContentCaptureSession extends ContentCaptureSession {
getMainCaptureSession().notifyViewTextChanged(mId, id, text);
}
@Override
void internalNotifyViewInsetsChanged(@NonNull Insets viewInsets) {
getMainCaptureSession().notifyViewInsetsChanged(mId, viewInsets);
}
@Override
public void internalNotifyViewTreeEvent(boolean started) {
getMainCaptureSession().notifyViewTreeEvent(mId, started);

42
core/java/android/view/contentcapture/ContentCaptureEvent.java
View File

@@ -23,6 +23,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.graphics.Insets;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.Log;
@@ -112,6 +113,11 @@ public final class ContentCaptureEvent implements Parcelable {
*/
public static final int TYPE_SESSION_PAUSED = 8;
/**
* Called when the view's insets are changed. The new insets associated with the
* event may then be retrieved by calling {@link #getInsets()}
*/
public static final int TYPE_VIEW_INSETS_CHANGED = 9;
/** @hide */
@IntDef(prefix = { "TYPE_" }, value = {
@@ -122,7 +128,8 @@ public final class ContentCaptureEvent implements Parcelable {
TYPE_VIEW_TREE_APPEARED,
TYPE_CONTEXT_UPDATED,
TYPE_SESSION_PAUSED,
TYPE_SESSION_RESUMED
TYPE_SESSION_RESUMED,
TYPE_VIEW_INSETS_CHANGED
})
@Retention(RetentionPolicy.SOURCE)
public @interface EventType{}
@@ -136,6 +143,7 @@ public final class ContentCaptureEvent implements Parcelable {
private @Nullable CharSequence mText;
private int mParentSessionId = NO_SESSION_ID;
private @Nullable ContentCaptureContext mClientContext;
private @Nullable Insets mInsets;
/** @hide */
public ContentCaptureEvent(int sessionId, int type, long eventTime) {
@@ -242,6 +250,13 @@ public final class ContentCaptureEvent implements Parcelable {
return this;
}
/** @hide */
@NonNull
public ContentCaptureEvent setInsets(@NonNull Insets insets) {
mInsets = insets;
return this;
}
/**
* Gets the type of the event.
*
@@ -304,6 +319,16 @@ public final class ContentCaptureEvent implements Parcelable {
return mText;
}
/**
* Gets the rectangle of the insets associated with the event. Valid insets will only be
* returned if the type of the event is {@link #TYPE_VIEW_INSETS_CHANGED}, otherwise they
* will be null.
*/
@Nullable
public Insets getInsets() {
return mInsets;
}
/**
* Merges event of the same type, either {@link #TYPE_VIEW_TEXT_CHANGED}
* or {@link #TYPE_VIEW_DISAPPEARED}.
@@ -369,7 +394,9 @@ public final class ContentCaptureEvent implements Parcelable {
}
if (mClientContext != null) {
pw.print(", context="); mClientContext.dump(pw); pw.println();
}
if (mInsets != null) {
pw.print(", insets="); pw.println(mInsets);
}
}
@@ -401,6 +428,9 @@ public final class ContentCaptureEvent implements Parcelable {
if (mClientContext != null) {
string.append(", context=").append(mClientContext);
}
if (mInsets != null) {
string.append(", insets=").append(mInsets);
}
return string.append(']').toString();
}
@@ -424,6 +454,9 @@ public final class ContentCaptureEvent implements Parcelable {
if (mType == TYPE_SESSION_STARTED || mType == TYPE_CONTEXT_UPDATED) {
parcel.writeParcelable(mClientContext, flags);
}
if (mType == TYPE_VIEW_INSETS_CHANGED) {
parcel.writeParcelable(mInsets, flags);
}
}
public static final @android.annotation.NonNull Parcelable.Creator<ContentCaptureEvent> CREATOR =
@@ -455,6 +488,9 @@ public final class ContentCaptureEvent implements Parcelable {
if (type == TYPE_SESSION_STARTED || type == TYPE_CONTEXT_UPDATED) {
event.setClientContext(parcel.readParcelable(null));
}
if (type == TYPE_VIEW_INSETS_CHANGED) {
event.setInsets(parcel.readParcelable(null));
}
return event;
}
@@ -488,6 +524,8 @@ public final class ContentCaptureEvent implements Parcelable {
return "VIEW_TREE_APPEARED";
case TYPE_CONTEXT_UPDATED:
return "CONTEXT_UPDATED";
case TYPE_VIEW_INSETS_CHANGED:
return "VIEW_INSETS_CHANGED";
default:
return "UKNOWN_TYPE: " + type;
}

14
core/java/android/view/contentcapture/ContentCaptureSession.java
View File

@@ -23,6 +23,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.graphics.Insets;
import android.util.DebugUtils;
import android.util.Log;
import android.view.View;
@@ -440,6 +441,19 @@ public abstract class ContentCaptureSession implements AutoCloseable {
abstract void internalNotifyViewTextChanged(@NonNull AutofillId id,
@Nullable CharSequence text);
/**
* Notifies the Intelligence Service that the insets of a view have changed.
*/
public final void notifyViewInsetsChanged(@NonNull Insets viewInsets) {
Preconditions.checkNotNull(viewInsets);
if (!isContentCaptureEnabled()) return;
internalNotifyViewInsetsChanged(viewInsets);
}
abstract void internalNotifyViewInsetsChanged(@NonNull Insets viewInsets);
/** @hide */
public abstract void internalNotifyViewTreeEvent(boolean started);

13
core/java/android/view/contentcapture/MainContentCaptureSession.java
View File

@@ -22,6 +22,7 @@ import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_RESUM
import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_STARTED;
import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_APPEARED;
import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_DISAPPEARED;
import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_INSETS_CHANGED;
import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_TEXT_CHANGED;
import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_TREE_APPEARED;
import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_TREE_APPEARING;
@@ -36,6 +37,7 @@ import android.annotation.UiThread;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ParceledListSlice;
import android.graphics.Insets;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
@@ -577,6 +579,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
notifyViewTextChanged(mId, id, text);
}
@Override
void internalNotifyViewInsetsChanged(@NonNull Insets viewInsets) {
notifyViewInsetsChanged(mId, viewInsets);
}
@Override
public void internalNotifyViewTreeEvent(boolean started) {
notifyViewTreeEvent(mId, started);
@@ -641,6 +648,12 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
.setText(text));
}
/** Public because is also used by ViewRootImpl */
public void notifyViewInsetsChanged(int sessionId, @NonNull Insets viewInsets) {
sendEvent(new ContentCaptureEvent(sessionId, TYPE_VIEW_INSETS_CHANGED)
.setInsets(viewInsets));
}
/** Public because is also used by ViewRootImpl */
public void notifyViewTreeEvent(int sessionId, boolean started) {
final int type = started ? TYPE_VIEW_TREE_APPEARING : TYPE_VIEW_TREE_APPEARED;

6
core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java
View File

@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.testng.Assert.assertThrows;
import android.graphics.Insets;
import android.view.View;
import android.view.ViewStructure;
import android.view.autofill.AutofillId;
@@ -171,6 +172,11 @@ public class ContentCaptureSessionTest {
throw new UnsupportedOperationException("should not have been called");
}
@Override
void internalNotifyViewInsetsChanged(Insets viewInsets) {
throw new UnsupportedOperationException("should not have been called");
}
@Override
public void updateContentCaptureContext(ContentCaptureContext context) {
throw new UnsupportedOperationException("should not have been called");