Merge "SurfaceControlViewHost: Always set FLAG_HARDWARE_ACCELERATED for embedded views" into sc-dev (4a94d396) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControlViewHost.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -217,16 +217,6 @@ public class SurfaceControlViewHost {
		}
		}

		/**
		* @hide
		*/
		@TestApi
		public void setView(@NonNull View view, @NonNull WindowManager.LayoutParams attrs) {
		Objects.requireNonNull(view);
		view.setLayoutParams(attrs);
		mViewRoot.setView(view, attrs, null);
		}

		/**
		* Set the root view of the SurfaceControlViewHost. This view will render in to
		* the SurfaceControl, and receive input based on the SurfaceControls positioning on
		@@ -240,10 +230,20 @@ public class SurfaceControlViewHost {
		final WindowManager.LayoutParams lp =
		new WindowManager.LayoutParams(width, height,
		WindowManager.LayoutParams.TYPE_APPLICATION, 0, PixelFormat.TRANSPARENT);
		lp.flags \|= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
		setView(view, lp);
		}

		/**
		* @hide
		*/
		@TestApi
		public void setView(@NonNull View view, @NonNull WindowManager.LayoutParams attrs) {
		Objects.requireNonNull(view);
		attrs.flags \|= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
		view.setLayoutParams(attrs);
		mViewRoot.setView(view, attrs, null);
		}

		/**
		* @return The view passed to setView, or null if none has been passed.
		*/