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

Commit 730e1316 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Request embedded focus if a SurfacePackage was added to SV" into... 

Merge "Request embedded focus if a SurfacePackage was added to SV" into udc-dev am: 6508dc31 am: 63508d35

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22315887



Change-Id: I4ab9391048fb5a29c7e823437b05107103e744ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b941ecc 63508d35

core/java/android/view/SurfaceView.java

+9 −1
Original line number Diff line number Diff line
@@ -1854,6 +1854,10 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
            applyTransactionOnVriDraw(transaction);

        }

        mSurfacePackage = p;



        if (isFocused()) {

            requestEmbeddedFocus(true);

        }

        invalidate();

    }
@@ -1949,6 +1953,10 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
    protected void onFocusChanged(boolean gainFocus, @FocusDirection int direction,

            @Nullable Rect previouslyFocusedRect) {

        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);

        requestEmbeddedFocus(gainFocus);

    }



    private void requestEmbeddedFocus(boolean gainFocus) {

        final ViewRootImpl viewRoot = getViewRootImpl();

        if (mSurfacePackage == null || viewRoot == null) {

            return;