Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19652c0c authored by Felipe Leme's avatar Felipe Leme
Browse files

Made ContentCapture APIs available for testing. 

Test: atest CtsContentCaptureServiceTestCases
Test: m update-api

Bug: 123584359
Bug: 119187075

Change-Id: I4ece03de6c7994451dbb9d0ce36d37f20656d3e0
parent 64b68b0b

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -5967,7 +5967,6 @@ package android.provider { 
    field public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH = "autofill_user_data_max_value_length";

    field public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH = "autofill_user_data_max_value_length";

    field public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH = "autofill_user_data_min_value_length";

    field public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH = "autofill_user_data_min_value_length";

    field public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";

    field public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";

    field public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled";

    field public static final String DOZE_ALWAYS_ON = "doze_always_on";

    field public static final String DOZE_ALWAYS_ON = "doze_always_on";

    field public static final String HUSH_GESTURE_USED = "hush_gesture_used";

    field public static final String HUSH_GESTURE_USED = "hush_gesture_used";

    field public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled";

    field public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled";

api/test-current.txt

+83 −0
Original line number Original line Diff line number Diff line
@@ -322,6 +322,14 @@ package android.app.admin { 




}

}





package android.app.assist {



  public static class AssistStructure.ViewNode {

    ctor public AssistStructure.ViewNode();

  }



}



package android.app.backup {

package android.app.backup {





  public class BackupManager {

  public class BackupManager {
@@ -2042,6 +2050,40 @@ package android.service.autofill.augmented { 




}

}





package android.service.contentcapture {



  @Deprecated public final class ContentCaptureEventsRequest implements android.os.Parcelable {

    method @Deprecated public int describeContents();

    method @Deprecated @NonNull public java.util.List<android.view.contentcapture.ContentCaptureEvent> getEvents();

    method @Deprecated public void writeToParcel(android.os.Parcel, int);

    field @Deprecated public static final android.os.Parcelable.Creator<android.service.contentcapture.ContentCaptureEventsRequest> CREATOR;

  }



  public abstract class ContentCaptureService extends android.app.Service {

    ctor public ContentCaptureService();

    method public void onActivitySnapshot(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.SnapshotData);

    method public void onConnected();

    method public void onContentCaptureEvent(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.view.contentcapture.ContentCaptureEvent);

    method @Deprecated public void onContentCaptureEventsRequest(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.ContentCaptureEventsRequest);

    method public void onCreateContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext, @NonNull android.view.contentcapture.ContentCaptureSessionId);

    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);

    method public void onDisconnected();

    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);

    method public final void setContentCaptureWhitelist(@Nullable java.util.List<java.lang.String>, @Nullable java.util.List<android.content.ComponentName>);

    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";

  }



  public final class SnapshotData implements android.os.Parcelable {

    method public int describeContents();

    method public android.app.assist.AssistContent getAssistContent();

    method public android.os.Bundle getAssistData();

    method public android.app.assist.AssistStructure getAssistStructure();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.service.contentcapture.SnapshotData> CREATOR;

  }



}



package android.service.notification {

package android.service.notification {





  @Deprecated public abstract class ConditionProviderService extends android.app.Service {

  @Deprecated public abstract class ConditionProviderService extends android.app.Service {
@@ -2608,6 +2650,47 @@ package android.view.autofill { 




}

}





package android.view.contentcapture {



  public final class ContentCaptureContext implements android.os.Parcelable {

    method @Nullable public String getAction();

    method @Nullable public android.content.ComponentName getActivityComponent();

    method public int getDisplayId();

    method @Nullable public android.os.Bundle getExtras();

    method public int getFlags();

    method @Nullable public android.view.contentcapture.ContentCaptureSessionId getParentSessionId();

    method public int getTaskId();

    method @Nullable public android.net.Uri getUri();

    field public static final int FLAG_DISABLED_BY_APP = 1; // 0x1

    field public static final int FLAG_DISABLED_BY_FLAG_SECURE = 2; // 0x2

  }



  public final class ContentCaptureEvent implements android.os.Parcelable {

    method public int describeContents();

    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 CharSequence getText();

    method public int getType();

    method @Nullable public android.view.contentcapture.ViewNode getViewNode();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureEvent> CREATOR;

    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_TEXT_CHANGED = 3; // 0x3

  }



  public final class ContentCaptureManager {

    method public boolean isContentCaptureFeatureEnabled();

    method public void setContentCaptureFeatureEnabled(boolean);

  }



  public final class ViewNode extends android.app.assist.AssistStructure.ViewNode {

    method @Nullable public android.view.autofill.AutofillId getParentAutofillId();

  }



}



package android.view.inputmethod {

package android.view.inputmethod {





  public final class InputMethodManager {

  public final class InputMethodManager {

core/java/android/app/assist/AssistStructure.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ package android.app.assist; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.Activity;

import android.app.Activity;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;
@@ -715,9 +716,10 @@ public class AssistStructure implements Parcelable { 
        ViewNode[] mChildren;

        ViewNode[] mChildren;





        // TODO(b/111276913): temporarily made public / @hide until we decide what will be used by

        // TODO(b/111276913): temporarily made public / @hide until we decide what will be used by

        // ScreenObservation.

        // COntent Capture.

        /** @hide */

        /** @hide */

        @SystemApi

        @SystemApi

        @TestApi

        public ViewNode() {

        public ViewNode() {

        }

        }

core/java/android/provider/Settings.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -5704,7 +5704,6 @@ public final class Settings { 
         * Defines whether Content Capture is enabled  for the user.

         * Defines whether Content Capture is enabled  for the user.

         * @hide

         * @hide

         */

         */

        @SystemApi

        @TestApi

        @TestApi

        public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled";

        public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled";







































core/java/android/service/contentcapture/ContentCaptureEventsRequest.java



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -17,6 +17,7 @@ package android.service.contentcapture;





























import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.SystemApi;







import android.annotation.SystemApi;














import android.annotation.TestApi;











import android.os.Parcel;







import android.os.Parcel;











import android.os.Parcelable;







import android.os.Parcelable;











import android.view.contentcapture.ContentCaptureEvent;







import android.view.contentcapture.ContentCaptureEvent;









@@ -32,6 +33,7 @@ import java.util.List;









 * @hide







 * @hide











 */







 */











@SystemApi







@SystemApi














@TestApi











@Deprecated







@Deprecated











public final class ContentCaptureEventsRequest implements Parcelable {







public final class ContentCaptureEventsRequest implements Parcelable {











// TODO(b/121051220): remove .java and .aidl once service implementation doesn't use it anymore







// TODO(b/121051220): remove .java and .aidl once service implementation doesn't use it anymore