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

Commit 911cb1fa authored by Felipe Leme's avatar Felipe Leme
Browse files

DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit. 

This reverts commit ef1c0b36.

Test: atest CtsContentCaptureServiceTestCases
Test: m update-api

Bug: 130726495

Change-Id: Iecda9df96722ac8a3184710796032b6c01bd8ea3
parent 3e212a00

api/test-current.txt

+9 −0
Original line number Diff line number Diff line
@@ -3170,9 +3170,12 @@ package android.view { 
  }



  @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {

    method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForContentCapture();

    method public android.view.View getTooltipView();

    method public static boolean isDefaultFocusHighlightEnabled();

    method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);

    method public final boolean isImportantForContentCapture();

    method public void onProvideContentCaptureStructure(@NonNull android.view.ViewStructure, int);

    method protected void resetResolvedDrawables();

    method public void resetResolvedLayoutDirection();

    method public void resetResolvedPadding();
@@ -3183,7 +3186,13 @@ package android.view { 
    method public boolean restoreFocusNotInCluster();

    method public void setAutofilled(boolean);

    method public final void setFocusedInCluster();

    method public void setImportantForContentCapture(int);

    method public void setIsRootNamespace(boolean);

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_AUTO = 0; // 0x0

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

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS = 8; // 0x8

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

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS = 4; // 0x4

  }



  public class ViewConfiguration {

core/java/android/service/contentcapture/ContentCaptureService.java

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public abstract class ContentCaptureService extends Service { 
        @Override

        public void onDataRemovalRequest(DataRemovalRequest request) {

            mHandler.sendMessage(

                    obtainMessage(ContentCaptureService::handleOnUserDataRemovalRequest,

                    obtainMessage(ContentCaptureService::handleOnDataRemovalRequest,

                            ContentCaptureService.this, request));

        }
@@ -466,7 +466,7 @@ public abstract class ContentCaptureService extends Service { 
        onDestroyContentCaptureSession(new ContentCaptureSessionId(sessionId));

    }



    private void handleOnUserDataRemovalRequest(@NonNull DataRemovalRequest request) {

    private void handleOnDataRemovalRequest(@NonNull DataRemovalRequest request) {

        onDataRemovalRequest(request);

    }