Merge "Revert "Always project ripples"" into lmp-mr1-dev (788e30bd) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/RippleDrawable.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -348,8 +348,7 @@ public class RippleDrawable extends LayerDrawable {
	*/		*/
	@Override		@Override
	public boolean isProjected() {		public boolean isProjected() {
	// Always project ripples. We'll handle bounding in draw().		return getNumberOfLayers() == 0;
	return true;
	}		}

	@Override		@Override
	@@ -852,7 +851,7 @@ public class RippleDrawable extends LayerDrawable {

	@Override		@Override
	public Rect getDirtyBounds() {		public Rect getDirtyBounds() {
	if (getNumberOfLayers() == 0) {		if (isProjected()) {
	final Rect drawingBounds = mDrawingBounds;		final Rect drawingBounds = mDrawingBounds;
	final Rect dirtyBounds = mDirtyBounds;		final Rect dirtyBounds = mDirtyBounds;
	dirtyBounds.set(drawingBounds);		dirtyBounds.set(drawingBounds);