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

2012-05-07 14:48:19 -07:00
parent ac8a61b6d4 72b26c1fa2
commit a482f942da
1 changed files with 2 additions and 2 deletions
--- a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
+++ b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
@@ -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;
    }

    /**