Merge "Request embedded focus if a SurfacePackage was added to SV" into udc-dev (6508dc31) · Commits · e / os / android_frameworks_base

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;