Merge "Fix Animation bugs from DisplayList properties integration" (b6f90cf8) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -11489,7 +11489,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		layerType != LAYER_TYPE_HARDWARE;

		int restoreTo = -1;
		if (!useDisplayListProperties) {
		if (!useDisplayListProperties \|\| transformToApply != null) {
		restoreTo = canvas.save();
		}
		if (offsetForScroll) {
		@@ -11523,11 +11523,9 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		if (concatMatrix) {
		// Undo the scroll translation, apply the transformation matrix,
		// then redo the scroll translate to get the correct result.
		if (!useDisplayListProperties) {
		canvas.translate(-transX, -transY);
		canvas.concat(transformToApply.getMatrix());
		canvas.translate(transX, transY);
		}
		parent.mGroupFlags \|= ViewGroup.FLAG_CLEAR_TRANSFORMATION;
		}

		@@ -11556,13 +11554,11 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		layerFlags \|= Canvas.CLIP_TO_LAYER_SAVE_FLAG;
		}
		if (layerType == LAYER_TYPE_NONE) {
		if (!useDisplayListProperties) {
		final int scrollX = hasDisplayList ? 0 : sx;
		final int scrollY = hasDisplayList ? 0 : sy;
		canvas.saveLayerAlpha(scrollX, scrollY, scrollX + mRight - mLeft,
		scrollY + mBottom - mTop, multipliedAlpha, layerFlags);
		}
		}
		} else {
		// Alpha is handled by the child directly, clobber the layer's alpha
		mPrivateFlags \|= ALPHA_SET;