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

am 2776b173: am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev

Browse Source 
* commit '2776b17327e99338630db96d68170b0327084b3d':
  Always project ripples
This commit is contained in:
Alan Viverette
2014-10-13 21:12:43 +00:00
committed by Android Git Automerger
parent 200ee78fe6 2776b17327
commit 6f351bcc7c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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