Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e1f123 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev 

* commit 'a482f942':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
parents 87d7c1d7 a482f942

core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java

+2 −2
Original line number Diff line number Diff line
@@ -538,6 +538,8 @@ public class MultiWaveView extends View { 
            maxWidth = Math.max(maxWidth, target.getWidth());

            maxHeight = Math.max(maxHeight, target.getHeight());

        }

        mTargetResourceId = resourceId;

        mTargetDrawables = targetDrawables;

        if (mMaxTargetWidth != maxWidth || mMaxTargetHeight != maxHeight) {

            mMaxTargetWidth = maxWidth;

            mMaxTargetHeight = maxHeight;
@@ -546,8 +548,6 @@ public class MultiWaveView extends View { 
            updateTargetPositions();

        }

        array.recycle();

        mTargetResourceId = resourceId;

        mTargetDrawables = targetDrawables;

    }



    /**