Merge "Always project ripples" into lmp-mr1-dev (2f82e48a) · Commits · e / os / android_frameworks_base

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

+3 −2

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

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

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