From 72b26c1fa25077b1f3367eb211be20b629f7b1d4 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Mon, 7 May 2012 14:39:31 -0700
Subject: [PATCH] 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
---
 .../android/internal/widget/multiwaveview/MultiWaveView.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
index 3ba2bc6cd47b0..a74ecd3831d06 100644
--- 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;
     }
 
     /**