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

Jim Miller · Android (Google) Code Review · commit a482f942dae9 · 2012-05-07T14:48:19.000-07:00
diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/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;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,8 @@ private void internalSetTargetResources(int resourceId) {`
`538`	`538`	`maxWidth = Math.max(maxWidth, target.getWidth());`
`539`	`539`	`maxHeight = Math.max(maxHeight, target.getHeight());`
`540`	`540`	`}`
	`541`	`+ mTargetResourceId = resourceId;`
	`542`	`+ mTargetDrawables = targetDrawables;`
`541`	`543`	`if (mMaxTargetWidth != maxWidth \|\| mMaxTargetHeight != maxHeight) {`
`542`	`544`	`mMaxTargetWidth = maxWidth;`
`543`	`545`	`mMaxTargetHeight = maxHeight;`
`@@ -546,8 +548,6 @@ private void internalSetTargetResources(int resourceId) {`
`546`	`548`	`updateTargetPositions();`
`547`	`549`	`}`
`548`	`550`	`array.recycle();`
`549`		`- mTargetResourceId = resourceId;`
`550`		`- mTargetDrawables = targetDrawables;`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`/**`