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

Commit 2659d3ee authored by Surbhi Kadam's avatar Surbhi Kadam
Browse files

Add an API to control the focusability of the View in SurfaceControlViewHost 

In addition, this change introduces a `LayoutParams` class to expose a
subset of WindowManager.LayoutParams to set on the
`SurfaceControlViewHost` hosted view. This will allow us to expose more
attributes to `SurfaceControlViewHost` as needed.

Bug: 425415517, 442659996
Test: presubmit
Flag: com.android.window.flags.scvh_set_focusable
Change-Id: Ib3c8d00ffc8e75e781a5749482faf167548f0f05
parent 4acc99e3

core/api/current.txt

+10 −0
Original line number Diff line number Diff line
@@ -54263,14 +54263,24 @@ package android.view { 
  public class SurfaceControlViewHost {

    ctor public SurfaceControlViewHost(@NonNull android.content.Context, @NonNull android.view.Display, @Nullable android.os.IBinder);

    ctor public SurfaceControlViewHost(@NonNull android.content.Context, @NonNull android.view.Display, @Nullable android.window.InputTransferToken);

    method @FlaggedApi("com.android.window.flags.scvh_set_focusable") @NonNull public android.view.SurfaceControlViewHost.LayoutParams getLayoutParams();

    method @Nullable public android.view.SurfaceControlViewHost.SurfacePackage getSurfacePackage();

    method @Nullable public android.view.View getView();

    method public void relayout(int, int);

    method @FlaggedApi("com.android.window.flags.scvh_set_focusable") public void relayout(@NonNull android.view.SurfaceControlViewHost.LayoutParams);

    method public void release();

    method public void setView(@NonNull android.view.View, int, int);

    method @FlaggedApi("com.android.window.flags.scvh_set_focusable") public void setView(@NonNull android.view.View, @NonNull android.view.SurfaceControlViewHost.LayoutParams);

    method @Deprecated public boolean transferTouchGestureToHost();

  }













  @FlaggedApi("com.android.window.flags.scvh_set_focusable") public static class SurfaceControlViewHost.LayoutParams {













    ctor @FlaggedApi("com.android.window.flags.scvh_set_focusable") public SurfaceControlViewHost.LayoutParams(int, int, boolean);













    method @FlaggedApi("com.android.window.flags.scvh_set_focusable") public int getHeight();













    method @FlaggedApi("com.android.window.flags.scvh_set_focusable") public int getWidth();













    method @FlaggedApi("com.android.window.flags.scvh_set_focusable") public boolean isFocusable();













  }



























  public static final class SurfaceControlViewHost.SurfacePackage implements android.os.Parcelable {















    ctor public SurfaceControlViewHost.SurfacePackage(@NonNull android.view.SurfaceControlViewHost.SurfacePackage);















    method public int describeContents();

























core/java/android/view/SurfaceControlViewHost.java



+122
−8




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.view;





























import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.TestApi;










@@ -483,10 +484,21 @@ public class SurfaceControlViewHost {













     * @param height The height to layout the View within, in pixels.















     */















    public void setView(@NonNull View view, int width, int height) {













        final WindowManager.LayoutParams lp =













                new WindowManager.LayoutParams(width, height,













                        WindowManager.LayoutParams.TYPE_APPLICATION, 0, PixelFormat.TRANSPARENT);













        setView(view, lp);













        setView(view, new LayoutParams(width, height, true /* focusable */));













    }



























    /**













     * Sets the root view of the {@link SurfaceControlViewHost}. This view will render in to the













     * SurfaceControl, and receive input based on the SurfaceControl's positioning on screen. It













     * will be laid out as if it were in a window of the passed in width and height.













     *













     * @param view The {@link View} to add













     * @param attrs The {@link LayoutParams} parameters for the {@link View}.













     */













    @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













    public void setView(@NonNull View view, @NonNull LayoutParams attrs) {













        Objects.requireNonNull(attrs);













        setView(view, attrs.toWindowManagerLayoutParams());















    }































    /**









@@ -495,6 +507,7 @@ public class SurfaceControlViewHost {













    @TestApi















    public void setView(@NonNull View view, @NonNull WindowManager.LayoutParams attrs) {















        Objects.requireNonNull(view);













        Objects.requireNonNull(attrs);















        attrs.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;















        addWindowToken(attrs);















        view.setLayoutParams(attrs);










@@ -551,10 +564,24 @@ public class SurfaceControlViewHost {













     * @param height Height in pixels















     */















    public void relayout(int width, int height) {













        final WindowManager.LayoutParams lp =













                new WindowManager.LayoutParams(width, height,













                        WindowManager.LayoutParams.TYPE_APPLICATION, 0, PixelFormat.TRANSPARENT);













        relayout(lp);













        relayout(new LayoutParams(width, height, true /* focusable */));













    }



























    /**













     * Modifies the {@link LayoutParams} of the root view.













     */













    @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













    public void relayout(@NonNull LayoutParams attrs) {













        Objects.requireNonNull(attrs);













        relayout(attrs.toWindowManagerLayoutParams());













    }



























    /**













     * Returns the {@link LayoutParams} of the root view.













     */













    @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













    public @NonNull LayoutParams getLayoutParams() {













        return LayoutParams.from(mViewRoot.mWindowAttributes);















    }































    /**










@@ -637,4 +664,91 @@ public class SurfaceControlViewHost {













        }















        return mWm.requestInputFocus(mViewRoot, focused);















    }



























    /**













     * Specifies the layout parameters for a {@link View} hosted by a {@link













     * SurfaceControlViewHost}. This is a subset of {@link WindowManager.LayoutParams} that are













     * applicable for {@link View}s hosted by {@code SurfaceControlViewHost}.













     */













    @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













    public static class LayoutParams {













        private final boolean mFocusable;













        private final int mWidth;













        private final int mHeight;



























        /**













         * Creates a new set of layout parameters. If {@code focusable} is set to false,













         * this {@link View} won't ever get key input focus, so the user can not send key or other













         * button events to it. Those will instead go to the current focused window.













         * If set to true, {@link View} is focusable.













         *













         * @param width The width, in pixels, of the bounds for the {@link View}.













         * @param height The height, in pixels, of the bounds for the {@link View}.













         * @param focusable Whether the {@link View} can receive key input focus.













         */













        @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













        public LayoutParams(int width, int height, boolean focusable) {













            mWidth = width;













            mHeight = height;













            mFocusable = focusable;













        }



























        /**













         * Returns {@code true} if this {@link View} can receive key input focus.













         */













        @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













        public boolean isFocusable() {













            return mFocusable;













        }



























        /**













         * Returns the width, in pixels, of the bounds for the {@link View}.













         */













        @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













        public int getWidth() {













            return mWidth;













        }



























        /**













         * Returns the height, in pixels, of the bounds for the {@link View}.













         */













        @FlaggedApi(Flags.FLAG_SCVH_SET_FOCUSABLE)













        public int getHeight() {













            return mHeight;













        }



























        /**













         * Converts these layout params to {@link WindowManager.LayoutParams} adding some defaults













         * set for SCVH.













         *













         * @hide













         */













        WindowManager.LayoutParams toWindowManagerLayoutParams() {













            final WindowManager.LayoutParams wmLayoutParams =













                    new WindowManager.LayoutParams(













                            mWidth,













                            mHeight,













                            WindowManager.LayoutParams.TYPE_APPLICATION,













                            0,













                            PixelFormat.TRANSPARENT);













            wmLayoutParams.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;













            if (!mFocusable) {













                wmLayoutParams.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;













            }













            return wmLayoutParams;













        }



























        /**













         * Creates a {@link LayoutParams} from {@link WindowManager.LayoutParams}.













         *













         * @hide













         */













        static LayoutParams from(WindowManager.LayoutParams wmLayoutParams) {













            final boolean focusable =













                    (wmLayoutParams.flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0;













            final LayoutParams layoutParams =













                    new LayoutParams(wmLayoutParams.width, wmLayoutParams.height, focusable);













            return layoutParams;













        }













    }















}
























core/java/android/window/flags/windowing_frontend.aconfig



+8
−1




























Original line number
Diff line number
Diff line








@@ -481,3 +481,10 @@ flag {













        purpose: PURPOSE_BUGFIX















    }















}



























flag {













    name: "scvh_set_focusable"













    namespace: "windowing_frontend"













    description: "Adds a focusable flag to SurfaceControlViewHost"













    bug: "425415517"













}
























libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/LetterboxEduWindowManagerTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -363,7 +363,7 @@ public class LetterboxEduWindowManagerTest extends ShellTestCase {













                mTaskListener, /* canShow= */ false));































        assertNull(windowManager.mLayout);













        verify(mViewHost, never()).relayout(any());













        verify(mViewHost, never()).relayout(any(WindowManager.LayoutParams.class));















    }































    @Test

































packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java



+4
−2




























Original line number
Diff line number
Diff line








@@ -757,7 +757,8 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {













        verify(mResources, atLeastOnce()).getDimensionPixelSize(anyInt());















        verify(mSurfaceControlViewHosts.get(0)).release();















        verify(mMirrorWindowControl).destroyControl();













        verify(mSurfaceControlViewHosts.get(1)).setView(any(), any());













        verify(mSurfaceControlViewHosts.get(1)).setView(any(),













                any(WindowManager.LayoutParams.class));















        verify(mMirrorWindowControl).showControl();















    }


























@@ -1669,7 +1670,8 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {













        dragButton.dispatchTouchEvent(















                obtainMotionEvent(downTime, downTime, ACTION_UP, 100, 100));





























        verify(mSurfaceControlViewHost).setView(any(View.class), any());













        verify(mSurfaceControlViewHost).setView(any(View.class),













                any(WindowManager.LayoutParams.class));















    }































    private <T extends View> T getInternalView(@IdRes int idRes) {