Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '07e1f12350819cc8fa93dbfe9e8655594b859e64':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
This commit is contained in:
Jim Miller
2012-05-08 11:33:38 -07:00
committed by Android Git Automerger
parent 88dcbda03b 07e1f12350
commit 6dfe7d937f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
View File

@@ -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;
}
/**