Merge changes I86847de5,Idd6c5871,Ibd0310a8 into qt-r1-bubbles-dev (3e6d1299) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ public class ActivityView extends ViewGroup {

		mActivityTaskManager = ActivityTaskManager.getService();
		mSurfaceView = new SurfaceView(context);
		mSurfaceView.setUseAlpha();
		mSurfaceView.setAlpha(0f);
		mSurfaceCallback = new SurfaceCallback();
		mSurfaceView.getHolder().addCallback(mSurfaceCallback);

core/java/android/view/SurfaceView.java

+212 −69

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static android.view.WindowManagerPolicyConstants.APPLICATION_PANEL_SUBLAY
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.content.res.CompatibilityInfo.Translator;
		import android.content.res.Configuration;
		import android.graphics.BlendMode;
		import android.graphics.Canvas;
		import android.graphics.Color;
		@@ -100,10 +99,10 @@ import java.util.concurrent.locks.ReentrantLock;
		public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallback {
		private static final String TAG = "SurfaceView";
		private static final boolean DEBUG = false;
		private static final boolean DEBUG_POSITION = false;

		@UnsupportedAppUsage
		final ArrayList<SurfaceHolder.Callback> mCallbacks
		= new ArrayList<SurfaceHolder.Callback>();
		final ArrayList<SurfaceHolder.Callback> mCallbacks = new ArrayList<>();

		final int[] mLocation = new int[2];

		@@ -126,8 +125,8 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		// we need to preserve the old one until the new one has drawn.
		SurfaceControl mDeferredDestroySurfaceControl;
		SurfaceControl mBackgroundControl;
		final Object mSurfaceControlLock = new Object();
		final Rect mTmpRect = new Rect();
		final Configuration mConfiguration = new Configuration();

		Paint mRoundedViewportPaint;

		@@ -137,24 +136,15 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		boolean mIsCreating = false;
		private volatile boolean mRtHandlingPositionUpdates = false;

		private final ViewTreeObserver.OnScrollChangedListener mScrollChangedListener
		= new ViewTreeObserver.OnScrollChangedListener() {
		@Override
		public void onScrollChanged() {
		updateSurface();
		}
		};
		private final ViewTreeObserver.OnScrollChangedListener mScrollChangedListener =
		this::updateSurface;

		@UnsupportedAppUsage
		private final ViewTreeObserver.OnPreDrawListener mDrawListener =
		new ViewTreeObserver.OnPreDrawListener() {
		@Override
		public boolean onPreDraw() {
		private final ViewTreeObserver.OnPreDrawListener mDrawListener = () -> {
		// reposition ourselves where the surface is
		mHaveFrame = getWidth() > 0 && getHeight() > 0;
		updateSurface();
		return true;
		}
		};

		boolean mRequestedVisible = false;
		@@ -173,6 +163,9 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		@UnsupportedAppUsage
		int mRequestedFormat = PixelFormat.RGB_565;

		boolean mUseAlpha = false;
		float mSurfaceAlpha = 1f;

		@UnsupportedAppUsage
		boolean mHaveFrame = false;
		boolean mSurfaceCreated = false;
		@@ -190,7 +183,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
		final Rect mSurfaceFrame = new Rect();
		int mLastSurfaceWidth = -1, mLastSurfaceHeight = -1;
		private Translator mTranslator;

		private boolean mGlobalListenersAdded;
		private boolean mAttachedToWindow;
		@@ -289,6 +281,152 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		updateSurface();
		}

		/**
		* Make alpha value of this view reflect onto the surface. This can only be called from at most
		* one SurfaceView within a view tree.
		*
		* <p class="note"><strong>Note:</strong> Alpha value of the view is ignored and the underlying
		* surface is rendered opaque by default.</p>
		*
		* @hide
		*/
		public void setUseAlpha() {
		if (!mUseAlpha) {
		mUseAlpha = true;
		updateSurfaceAlpha();
		}
		}

		@Override
		public void setAlpha(float alpha) {
		// Sets the opacity of the view to a value, where 0 means the view is completely transparent
		// and 1 means the view is completely opaque.
		//
		// Note: Alpha value of this view is ignored by default. To enable alpha blending, you need
		// to call setUseAlpha() as well.
		// This view doesn't support translucent opacity if the view is located z-below, since the
		// logic to punch a hole in the view hierarchy cannot handle such case. See also
		// #clearSurfaceViewPort(Canvas)
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " setAlpha: mUseAlpha = " + mUseAlpha + " alpha=" + alpha);
		}
		super.setAlpha(alpha);
		updateSurfaceAlpha();
		}

		private float getFixedAlpha() {
		// Compute alpha value to be set on the underlying surface.
		final float alpha = getAlpha();
		return mUseAlpha && (mSubLayer > 0 \|\| alpha == 0f) ? alpha : 1f;
		}

		private void updateSurfaceAlpha() {
		if (!mUseAlpha) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha: setUseAlpha() is not called, ignored.");
		}
		return;
		}
		final float viewAlpha = getAlpha();
		if (mSubLayer < 0 && 0f < viewAlpha && viewAlpha < 1f) {
		Log.w(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha:"
		+ " translucent color is not supported for a surface placed z-below.");
		}
		if (!mHaveFrame) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha: has no surface.");
		}
		return;
		}
		final ViewRootImpl viewRoot = getViewRootImpl();
		if (viewRoot == null) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha: ViewRootImpl not available.");
		}
		return;
		}
		if (mSurfaceControl == null) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ "updateSurfaceAlpha:"
		+ " surface is not yet created, or already released.");
		}
		return;
		}
		final Surface parent = viewRoot.mSurface;
		if (parent == null \|\| !parent.isValid()) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha: ViewRootImpl has no valid surface");
		}
		return;
		}
		final float alpha = getFixedAlpha();
		if (alpha != mSurfaceAlpha) {
		if (isHardwareAccelerated()) {
		/*
		* Schedule a callback that reflects an alpha value onto the underlying surfaces.
		* This gets called on a RenderThread worker thread, so members accessed here must
		* be protected by a lock.
		*/
		viewRoot.registerRtFrameCallback(frame -> {
		try {
		final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
		synchronized (mSurfaceControlLock) {
		if (!parent.isValid()) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha RT:"
		+ " ViewRootImpl has no valid surface");
		}
		return;
		}
		if (mSurfaceControl == null) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ "updateSurfaceAlpha RT:"
		+ " mSurfaceControl has already released");
		}
		return;
		}
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha RT: set alpha=" + alpha);
		}
		t.setAlpha(mSurfaceControl, alpha);
		t.deferTransactionUntilSurface(mSurfaceControl, parent, frame);
		}
		// It's possible that mSurfaceControl is released in the UI thread before
		// the transaction completes. If that happens, an exception is thrown, which
		// must be caught immediately.
		t.apply();
		} catch (Exception e) {
		Log.e(TAG, System.identityHashCode(this)
		+ "updateSurfaceAlpha RT: Exception during surface transaction", e);
		}
		});
		damageInParent();
		} else {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurfaceAlpha: set alpha=" + alpha);
		}
		SurfaceControl.openTransaction();
		try {
		mSurfaceControl.setAlpha(alpha);
		} finally {
		SurfaceControl.closeTransaction();
		}
		}
		mSurfaceAlpha = alpha;
		}
		}

		private void performDrawFinished() {
		if (mPendingReportDraws > 0) {
		mDrawFinished = true;
		@@ -338,11 +476,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		mRequestedVisible = false;

		updateSurface();
		if (mSurfaceControl != null) {
		mTmpTransaction.remove(mSurfaceControl).apply();
		}
		mSurfaceControl = null;

		releaseSurfaces();
		mHaveFrame = false;

		super.onDetachedFromWindow();
		@@ -511,15 +645,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		}
		}

		private Rect getParentSurfaceInsets() {
		final ViewRootImpl root = getViewRootImpl();
		if (root == null) {
		return null;
		} else {
		return root.mWindowAttributes.surfaceInsets;
		}
		}

		private void updateBackgroundVisibilityInTransaction(SurfaceControl viewRoot) {
		if (mBackgroundControl == null) {
		return;
		@@ -533,6 +658,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		}

		private void releaseSurfaces() {
		synchronized (mSurfaceControlLock) {
		if (mSurfaceControl != null) {
		mTmpTransaction.remove(mSurfaceControl);
		mSurfaceControl = null;
		@@ -543,20 +669,29 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		}
		mTmpTransaction.apply();
		}
		mSurfaceAlpha = 1f;
		}

		/** @hide */
		protected void updateSurface() {
		if (!mHaveFrame) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this) + " updateSurface: has no frame");
		}
		return;
		}
		ViewRootImpl viewRoot = getViewRootImpl();
		if (viewRoot == null \|\| viewRoot.mSurface == null \|\| !viewRoot.mSurface.isValid()) {
		if (DEBUG) {
		Log.d(TAG, System.identityHashCode(this)
		+ " updateSurface: no valid surface");
		}
		return;
		}

		mTranslator = viewRoot.mTranslator;
		if (mTranslator != null) {
		mSurface.setCompatibilityTranslator(mTranslator);
		final Translator translator = viewRoot.mTranslator;
		if (translator != null) {
		mSurface.setCompatibilityTranslator(translator);
		}

		int myWidth = mRequestedWidth;
		@@ -564,20 +699,25 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		int myHeight = mRequestedHeight;
		if (myHeight <= 0) myHeight = getHeight();

		final float alpha = getFixedAlpha();
		final boolean formatChanged = mFormat != mRequestedFormat;
		final boolean visibleChanged = mVisible != mRequestedVisible;
		final boolean alphaChanged = mSurfaceAlpha != alpha;
		final boolean creating = (mSurfaceControl == null \|\| formatChanged \|\| visibleChanged)
		&& mRequestedVisible;
		final boolean sizeChanged = mSurfaceWidth != myWidth \|\| mSurfaceHeight != myHeight;
		final boolean windowVisibleChanged = mWindowVisibility != mLastWindowVisibility;
		boolean redrawNeeded = false;

		if (creating \|\| formatChanged \|\| sizeChanged \|\| visibleChanged \|\| windowVisibleChanged) {
		if (creating \|\| formatChanged \|\| sizeChanged \|\| visibleChanged \|\| (mUseAlpha
		&& alphaChanged) \|\| windowVisibleChanged) {
		getLocationInWindow(mLocation);

		if (DEBUG) Log.i(TAG, System.identityHashCode(this) + " "
		+ "Changes: creating=" + creating
		+ " format=" + formatChanged + " size=" + sizeChanged
		+ " visible=" + visibleChanged + " alpha=" + alphaChanged
		+ " mUseAlpha=" + mUseAlpha
		+ " visible=" + visibleChanged
		+ " left=" + (mWindowSpaceLeft != mLocation[0])
		+ " top=" + (mWindowSpaceTop != mLocation[1]));
		@@ -595,11 +735,11 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		mScreenRect.top = mWindowSpaceTop;
		mScreenRect.right = mWindowSpaceLeft + getWidth();
		mScreenRect.bottom = mWindowSpaceTop + getHeight();
		if (mTranslator != null) {
		mTranslator.translateRectInAppWindowToScreen(mScreenRect);
		if (translator != null) {
		translator.translateRectInAppWindowToScreen(mScreenRect);
		}

		final Rect surfaceInsets = getParentSurfaceInsets();
		final Rect surfaceInsets = viewRoot.mWindowAttributes.surfaceInsets;
		mScreenRect.offset(surfaceInsets.left, surfaceInsets.top);

		if (creating) {
		@@ -648,6 +788,10 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		mSurfaceControl.hide();
		}
		updateBackgroundVisibilityInTransaction(viewRoot.getSurfaceControl());
		if (mUseAlpha) {
		mSurfaceControl.setAlpha(alpha);
		mSurfaceAlpha = alpha;
		}

		// While creating the surface, we will set it's initial
		// geometry. Outside of that though, we should generally
		@@ -682,11 +826,11 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb

		mSurfaceFrame.left = 0;
		mSurfaceFrame.top = 0;
		if (mTranslator == null) {
		if (translator == null) {
		mSurfaceFrame.right = mSurfaceWidth;
		mSurfaceFrame.bottom = mSurfaceHeight;
		} else {
		float appInvertedScale = mTranslator.applicationInvertedScale;
		float appInvertedScale = translator.applicationInvertedScale;
		mSurfaceFrame.right = (int) (mSurfaceWidth * appInvertedScale + 0.5f);
		mSurfaceFrame.bottom = (int) (mSurfaceHeight * appInvertedScale + 0.5f);
		}
		@@ -704,7 +848,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		try {
		redrawNeeded \|= visible && !mDrawFinished;

		SurfaceHolder.Callback callbacks[] = null;
		SurfaceHolder.Callback[] callbacks = null;

		final boolean surfaceChanged = creating;
		if (mSurfaceCreated && (surfaceChanged \|\| (!visible && visibleChanged))) {
		@@ -790,7 +934,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		mIsCreating = false;
		if (mSurfaceControl != null && !mSurfaceCreated) {
		mSurface.release();

		releaseSurfaces();
		}
		}
		@@ -820,8 +963,8 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		mScreenRect.set(mWindowSpaceLeft, mWindowSpaceTop,
		mWindowSpaceLeft + mLocation[0], mWindowSpaceTop + mLocation[1]);

		if (mTranslator != null) {
		mTranslator.translateRectInAppWindowToScreen(mScreenRect);
		if (translator != null) {
		translator.translateRectInAppWindowToScreen(mScreenRect);
		}

		if (mSurfaceControl == null) {
		@@ -830,10 +973,13 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb

		if (!isHardwareAccelerated() \|\| !mRtHandlingPositionUpdates) {
		try {
		if (DEBUG) Log.d(TAG, String.format("%d updateSurfacePosition UI, " +
		"postion = [%d, %d, %d, %d]", System.identityHashCode(this),
		if (DEBUG_POSITION) {
		Log.d(TAG, String.format("%d updateSurfacePosition UI, "
		+ "position = [%d, %d, %d, %d]",
		System.identityHashCode(this),
		mScreenRect.left, mScreenRect.top,
		mScreenRect.right, mScreenRect.bottom));
		}
		setParentSpaceRectangle(mScreenRect, -1);
		} catch (Exception ex) {
		Log.e(TAG, "Exception configuring surface", ex);
		@@ -854,9 +1000,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		mDeferredDestroySurfaceControl = null;
		}

		runOnUiThread(() -> {
		performDrawFinished();
		});
		runOnUiThread(this::performDrawFinished);
		}

		/**
		@@ -886,7 +1030,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		if (mViewVisibility) {
		mRtTransaction.show(surface);
		}

		}

		private void setParentSpaceRectangle(Rect position, long frameNumber) {
		@@ -927,10 +1070,10 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		return;
		}
		try {
		if (DEBUG) {
		if (DEBUG_POSITION) {
		Log.d(TAG, String.format(
		"%d updateSurfacePosition RenderWorker, frameNr = %d, "
		+ "postion = [%d, %d, %d, %d]",
		+ "position = [%d, %d, %d, %d]",
		System.identityHashCode(this), frameNumber,
		left, top, right, bottom));
		}
		@@ -966,7 +1109,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		};

		private SurfaceHolder.Callback[] getSurfaceCallbacks() {
		SurfaceHolder.Callback callbacks[];
		SurfaceHolder.Callback[] callbacks;
		synchronized (mCallbacks) {
		callbacks = new SurfaceHolder.Callback[mCallbacks.size()];
		mCallbacks.toArray(callbacks);
		@@ -1036,7 +1179,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		synchronized (mCallbacks) {
		// This is a linear search, but in practice we'll
		// have only a couple callbacks, so it doesn't matter.
		if (mCallbacks.contains(callback) == false) {
		if (!mCallbacks.contains(callback)) {
		mCallbacks.add(callback);
		}
		}

core/java/android/view/ViewTreeObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1074,7 +1074,7 @@ public final class ViewTreeObserver {
		* be called manually if you are forcing the drawing on a View or a hierarchy of Views
		* that are not attached to a Window or in the GONE state.
		*
		* @return True if the current draw should be canceled and resceduled, false otherwise.
		* @return True if the current draw should be canceled and rescheduled, false otherwise.
		*/
		@SuppressWarnings("unchecked")
		public final boolean dispatchOnPreDraw() {