am 5971d03f: am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers... (bf8d8e73) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20RecordingCanvas.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -235,18 +235,6 @@ class GLES20RecordingCanvas extends GLES20Canvas implements Poolable<GLES20Recor
		recordShaderBitmap(paint);
		}

		@Override
		public void drawRect(Rect r, Paint paint) {
		super.drawRect(r, paint);
		recordShaderBitmap(paint);
		}

		@Override
		public void drawRect(RectF r, Paint paint) {
		super.drawRect(r, paint);
		recordShaderBitmap(paint);
		}

		@Override
		public void drawRoundRect(RectF rect, float rx, float ry, Paint paint) {
		super.drawRoundRect(rect, rx, ry, paint);

+7 −2

Original line number	Diff line number	Diff line
		@@ -507,17 +507,22 @@ public abstract class HardwareRenderer {
		* @param width The width of the drawing surface.
		* @param height The height of the drawing surface.
		* @param surface The surface to hardware accelerate
		*
		* @return true if the surface was initialized, false otherwise. Returning
		* false might mean that the surface was already initialized.
		*/
		void initializeIfNeeded(int width, int height, Surface surface)
		boolean initializeIfNeeded(int width, int height, Surface surface)
		throws Surface.OutOfResourcesException {
		if (isRequested()) {
		// We lost the gl context, so recreate it.
		if (!isEnabled()) {
		if (initialize(surface)) {
		setup(width, height);
		return true;
		}
		}
		}
		return false;
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -2904,6 +2904,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		int mOldHeightMeasureSpec = Integer.MIN_VALUE;

		@ViewDebug.ExportedProperty(deepExport = true, prefix = "bg_")
		private Drawable mBackground;

		private int mBackgroundResource;

+7 −3

Original line number	Diff line number	Diff line
		@@ -923,8 +923,12 @@ public class ViewDebug {
		private static void dumpViewProperties(Context context, Object view,
		BufferedWriter out, String prefix) throws IOException {

		Class<?> klass = view.getClass();
		if (view == null) {
		out.write(prefix + "=4,null ");
		return;
		}

		Class<?> klass = view.getClass();
		do {
		exportFields(context, view, out, klass, prefix);
		exportMethods(context, view, out, klass, prefix);
		@@ -1064,8 +1068,8 @@ public class ViewDebug {
		return;
		} else if (!type.isPrimitive()) {
		if (property.deepExport()) {
		dumpViewProperties(context, field.get(view), out, prefix
		+ property.prefix());
		dumpViewProperties(context, field.get(view), out, prefix +
		property.prefix());
		continue;
		}
		}

+8 −7

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.util.AndroidRuntimeException;
		import android.util.DisplayMetrics;
		import android.util.Log;
		@@ -2819,10 +2818,10 @@ public final class ViewRootImpl implements ViewParent,
		case MSG_RESIZED: {
		// Recycled in the fall through...
		SomeArgs args = (SomeArgs) msg.obj;
		if (mWinFrame.equals((Rect) args.arg1)
		&& mPendingContentInsets.equals((Rect) args.arg2)
		&& mPendingVisibleInsets.equals((Rect) args.arg3)
		&& ((Configuration) args.arg4 == null)) {
		if (mWinFrame.equals(args.arg1)
		&& mPendingContentInsets.equals(args.arg2)
		&& mPendingVisibleInsets.equals(args.arg3)
		&& args.arg4 == null) {
		break;
		}
		} // fall through...
		@@ -2884,8 +2883,10 @@ public final class ViewRootImpl implements ViewParent,
		mSurface != null && mSurface.isValid()) {
		mFullRedrawNeeded = true;
		try {
		mAttachInfo.mHardwareRenderer.initializeIfNeeded(mWidth, mHeight,
		mHolder.getSurface());
		if (mAttachInfo.mHardwareRenderer.initializeIfNeeded(
		mWidth, mHeight, mHolder.getSurface())) {
		mFullRedrawNeeded = true;
		}
		} catch (Surface.OutOfResourcesException e) {
		Log.e(TAG, "OutOfResourcesException locking surface", e);
		try {