diff options
6 files changed, 15 insertions, 38 deletions
diff --git a/core/java/android/service/autofill/IInlineSuggestionUiCallback.aidl b/core/java/android/service/autofill/IInlineSuggestionUiCallback.aidl index 210f95f55a9f..101165176293 100644 --- a/core/java/android/service/autofill/IInlineSuggestionUiCallback.aidl +++ b/core/java/android/service/autofill/IInlineSuggestionUiCallback.aidl @@ -17,7 +17,7 @@ package android.service.autofill; import android.os.IBinder; -import android.view.SurfaceControl; +import android.view.SurfaceControlViewHost; /** * Interface to receive events from inline suggestions. @@ -26,7 +26,7 @@ import android.view.SurfaceControl; */ oneway interface IInlineSuggestionUiCallback { void onAutofill(); - void onContent(in SurfaceControl surface); + void onContent(in SurfaceControlViewHost.SurfacePackage surface); void onError(); void onTransferTouchFocusToImeWindow(in IBinder sourceInputToken, int displayId); } diff --git a/core/java/android/service/autofill/InlineSuggestionRenderService.java b/core/java/android/service/autofill/InlineSuggestionRenderService.java index fcdefac3163b..ee15283715ff 100644 --- a/core/java/android/service/autofill/InlineSuggestionRenderService.java +++ b/core/java/android/service/autofill/InlineSuggestionRenderService.java @@ -32,7 +32,6 @@ import android.os.Looper; import android.os.RemoteException; import android.util.Log; import android.view.Display; -import android.view.SurfaceControl; import android.view.SurfaceControlViewHost; import android.view.View; import android.view.WindowManager; @@ -104,14 +103,14 @@ public abstract class InlineSuggestionRenderService extends Service { } }); - sendResult(callback, host.getSurfacePackage().getSurfaceControl()); + sendResult(callback, host.getSurfacePackage()); } finally { updateDisplay(Display.DEFAULT_DISPLAY); } } private void sendResult(@NonNull IInlineSuggestionUiCallback callback, - @Nullable SurfaceControl surface) { + @Nullable SurfaceControlViewHost.SurfacePackage surface) { try { callback.onContent(surface); } catch (RemoteException e) { diff --git a/core/java/android/view/inline/InlineContentView.java b/core/java/android/view/inline/InlineContentView.java index b143fad778ec..2a8ca0b6a354 100644 --- a/core/java/android/view/inline/InlineContentView.java +++ b/core/java/android/view/inline/InlineContentView.java @@ -19,8 +19,7 @@ package android.view.inline; import android.annotation.NonNull; import android.content.Context; import android.graphics.PixelFormat; -import android.view.SurfaceControl; -import android.view.SurfaceHolder; +import android.view.SurfaceControlViewHost; import android.view.SurfaceView; /** @@ -30,31 +29,10 @@ import android.view.SurfaceView; */ public class InlineContentView extends SurfaceView { public InlineContentView(@NonNull Context context, - @NonNull SurfaceControl surfaceControl) { + @NonNull SurfaceControlViewHost.SurfacePackage surfacePackage) { super(context); setZOrderOnTop(true); - getHolder().addCallback(new SurfaceHolder.Callback() { - @Override - public void surfaceCreated(SurfaceHolder holder) { - holder.setFormat(PixelFormat.TRANSPARENT); - new SurfaceControl.Transaction() - .reparent(surfaceControl, getSurfaceControl()) - .setVisibility(surfaceControl, /* visible */ true) - .apply(); - } - - @Override - public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - // TODO(b/137800469): implement this. - } - - @Override - public void surfaceDestroyed(SurfaceHolder holder) { - new SurfaceControl.Transaction() - .setVisibility(surfaceControl, false) - .reparent(surfaceControl, null) - .apply(); - } - }); + setChildSurfacePackage(surfacePackage); + getHolder().setFormat(PixelFormat.TRANSPARENT); } } diff --git a/core/java/android/view/inputmethod/InlineSuggestion.java b/core/java/android/view/inputmethod/InlineSuggestion.java index ec485d3b3522..650061396992 100644 --- a/core/java/android/view/inputmethod/InlineSuggestion.java +++ b/core/java/android/view/inputmethod/InlineSuggestion.java @@ -27,7 +27,7 @@ import android.os.Parcelable; import android.os.RemoteException; import android.util.Size; import android.util.Slog; -import android.view.SurfaceControl; +import android.view.SurfaceControlViewHost; import android.view.View; import android.view.inline.InlineContentView; import android.view.inline.InlinePresentationSpec; @@ -151,7 +151,7 @@ public final class InlineSuggestion implements Parcelable { } @Override - public void onContent(SurfaceControl content) { + public void onContent(SurfaceControlViewHost.SurfacePackage content) { final InlineContentCallbackImpl callbackImpl = mCallbackImpl.get(); if (callbackImpl != null) { callbackImpl.onContent(content); @@ -173,7 +173,7 @@ public final class InlineSuggestion implements Parcelable { mCallback = callback; } - public void onContent(SurfaceControl content) { + public void onContent(SurfaceControlViewHost.SurfacePackage content) { if (content == null) { mCallbackExecutor.execute(() -> mCallback.accept(/* view */null)); } else { diff --git a/core/java/com/android/internal/view/inline/IInlineContentCallback.aidl b/core/java/com/android/internal/view/inline/IInlineContentCallback.aidl index 8cc49ca210be..29bdf5661eaf 100644 --- a/core/java/com/android/internal/view/inline/IInlineContentCallback.aidl +++ b/core/java/com/android/internal/view/inline/IInlineContentCallback.aidl @@ -16,12 +16,12 @@ package com.android.internal.view.inline; -import android.view.SurfaceControl; +import android.view.SurfaceControlViewHost; /** * Binder interface to send the inline content from one process to the other. * {@hide} */ oneway interface IInlineContentCallback { - void onContent(in SurfaceControl content); + void onContent(in SurfaceControlViewHost.SurfacePackage content); } diff --git a/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java b/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java index 9bf369089e50..4cf4463feaad 100644 --- a/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java +++ b/services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java @@ -30,7 +30,7 @@ import android.service.autofill.IInlineSuggestionUiCallback; import android.service.autofill.InlinePresentation; import android.text.TextUtils; import android.util.Slog; -import android.view.SurfaceControl; +import android.view.SurfaceControlViewHost; import android.view.autofill.AutofillId; import android.view.autofill.AutofillManager; import android.view.autofill.AutofillValue; @@ -328,7 +328,7 @@ public final class InlineSuggestionFactory { } @Override - public void onContent(SurfaceControl surface) + public void onContent(SurfaceControlViewHost.SurfacePackage surface) throws RemoteException { callback.onContent(surface); } |