Merge "Rename HardwareLayer -> TextureLayer" (2cb882d6) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1822,7 +1822,7 @@ Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;-
		Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionModified(IILandroid/view/textclassifier/TextSelection;)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
		Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionStarted(I)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;
		Landroid/view/textservice/TextServicesManager;->isSpellCheckerEnabled()Z
		Landroid/view/TextureView;->mLayer:Landroid/view/HardwareLayer;
		Landroid/view/TextureView;->mLayer:Landroid/view/TextureLayer;
		Landroid/view/TextureView;->mNativeWindow:J
		Landroid/view/TextureView;->mSurface:Landroid/graphics/SurfaceTexture;
		Landroid/view/TextureView;->mUpdateListener:Landroid/graphics/SurfaceTexture$OnFrameAvailableListener;

config/preloaded-classes

+1 −1

Original line number	Diff line number	Diff line
		@@ -2289,7 +2289,7 @@ android.view.GestureDetector$SimpleOnGestureListener
		android.view.Gravity
		android.view.HandlerActionQueue
		android.view.HandlerActionQueue$HandlerAction
		android.view.HardwareLayer
		android.view.TextureLayer
		android.view.IGraphicsStats
		android.view.IGraphicsStats$Stub
		android.view.IGraphicsStats$Stub$Proxy

core/java/android/view/DisplayListCanvas.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -198,8 +198,8 @@ public final class DisplayListCanvas extends RecordingCanvas {
		*
		* @param layer The layer to composite on this canvas
		*/
		void drawHardwareLayer(HardwareLayer layer) {
		nDrawLayer(mNativeCanvasWrapper, layer.getLayerHandle());
		void drawTextureLayer(TextureLayer layer) {
		nDrawTextureLayer(mNativeCanvasWrapper, layer.getLayerHandle());
		}

		///////////////////////////////////////////////////////////////////////////
		@@ -257,7 +257,7 @@ public final class DisplayListCanvas extends RecordingCanvas {
		@CriticalNative
		private static native void nDrawRenderNode(long renderer, long renderNode);
		@CriticalNative
		private static native void nDrawLayer(long renderer, long layer);
		private static native void nDrawTextureLayer(long renderer, long layer);
		@CriticalNative
		private static native void nDrawCircle(long renderer, long propCx,
		long propCy, long propRadius, long propPaint);

core/java/android/view/HardwareLayer.java→core/java/android/view/TextureLayer.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -25,19 +25,17 @@ import android.graphics.SurfaceTexture;
		import com.android.internal.util.VirtualRefBasePtr;

		/**
		* A hardware layer can be used to render graphics operations into a hardware
		* friendly buffer. For instance, with an OpenGL backend a hardware layer
		* would use a Frame Buffer Object (FBO.) The hardware layer can be used as
		* a drawing cache when a complex set of graphics operations needs to be
		* drawn several times.
		* TextureLayer represents a SurfaceTexture that will be composited by RenderThread into the
		* frame when drawn in a HW accelerated Canvas. This is backed by a DeferredLayerUpdater on
		* the native side.
		*
		* @hide
		*/
		final class HardwareLayer {
		final class TextureLayer {
		private ThreadedRenderer mRenderer;
		private VirtualRefBasePtr mFinalizer;

		private HardwareLayer(ThreadedRenderer renderer, long deferredUpdater) {
		private TextureLayer(ThreadedRenderer renderer, long deferredUpdater) {
		if (renderer == null \|\| deferredUpdater == 0) {
		throw new IllegalArgumentException("Either hardware renderer: " + renderer
		+ " or deferredUpdater: " + deferredUpdater + " is invalid");
		@@ -141,11 +139,12 @@ final class HardwareLayer {
		mRenderer.pushLayerUpdate(this);
		}

		static HardwareLayer adoptTextureLayer(ThreadedRenderer renderer, long layer) {
		return new HardwareLayer(renderer, layer);
		static TextureLayer adoptTextureLayer(ThreadedRenderer renderer, long layer) {
		return new TextureLayer(renderer, layer);
		}

		private static native boolean nPrepare(long layerUpdater, int width, int height, boolean isOpaque);
		private static native boolean nPrepare(long layerUpdater, int width, int height,
		boolean isOpaque);
		private static native void nSetLayerPaint(long layerUpdater, long paint);
		private static native void nSetTransform(long layerUpdater, long matrix);
		private static native void nSetSurfaceTexture(long layerUpdater, SurfaceTexture surface);

core/java/android/view/TextureView.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ import android.util.Log;
		public class TextureView extends View {
		private static final String LOG_TAG = "TextureView";

		private HardwareLayer mLayer;
		private TextureLayer mLayer;
		private SurfaceTexture mSurface;
		private SurfaceTextureListener mListener;
		private boolean mHadSurface;
		@@ -336,13 +336,13 @@ public class TextureView extends View {
		if (canvas.isHardwareAccelerated()) {
		DisplayListCanvas displayListCanvas = (DisplayListCanvas) canvas;

		HardwareLayer layer = getHardwareLayer();
		TextureLayer layer = getTextureLayer();
		if (layer != null) {
		applyUpdate();
		applyTransformMatrix();

		mLayer.setLayerPaint(mLayerPaint); // ensure layer paint is up to date
		displayListCanvas.drawHardwareLayer(layer);
		displayListCanvas.drawTextureLayer(layer);
		}
		}
		}
		@@ -369,7 +369,7 @@ public class TextureView extends View {
		}
		}

		HardwareLayer getHardwareLayer() {
		TextureLayer getTextureLayer() {
		if (mLayer == null) {
		if (mAttachInfo == null \|\| mAttachInfo.mThreadedRenderer == null) {
		return null;
		@@ -602,7 +602,7 @@ public class TextureView extends View {
		// the layer here thanks to the validate() call at the beginning of
		// this method
		if (mLayer == null && mUpdateSurface) {
		getHardwareLayer();
		getTextureLayer();
		}

		if (mLayer != null) {