Fix 6397736: Fix issue with MultiWaveView in incoming call screen.

This fixes a bug where the incoming call screen sometimes had
misplaced icons. The code previously relied on an additional layout
pass that doesn't happen in the incoming call screen in some cases.

Change-Id: If7c39994c1bdadbd3e97f4b9ebb45f68893fd9bd

Author: Jim Miller

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

@@ -538,6 +538,8 @@ private void internalSetTargetResources(int resourceId) {
             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 @@ private void internalSetTargetResources(int resourceId) {
             updateTargetPositions();
         }
         array.recycle();
-        mTargetResourceId = resourceId;
-        mTargetDrawables = targetDrawables;
     }
 
     /**