Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev

Browse Source 
* commit '788e30bd34b575e029d6b55d74e9c81ce28b21df':
  Revert "Always project ripples"
This commit is contained in:
Alan Viverette
2014-10-14 00:41:49 +00:00
committed by Android Git Automerger
parent a99cad8dc1 788e30bd34
commit db8ecf8005
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -348,8 +348,7 @@ public class RippleDrawable extends LayerDrawable {
*/
@Override
public boolean isProjected() {
// Always project ripples. We'll handle bounding in draw().
return true;
return getNumberOfLayers() == 0;
}
@Override
@@ -852,7 +851,7 @@ public class RippleDrawable extends LayerDrawable {
@Override
public Rect getDirtyBounds() {
if (getNumberOfLayers() == 0) {
if (isProjected()) {
final Rect drawingBounds = mDrawingBounds;
final Rect dirtyBounds = mDirtyBounds;
dirtyBounds.set(drawingBounds);