diff options
| author | Jim Miller <jaggies@google.com> | 2012-05-07 14:48:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 14:48:19 -0700 |
| commit | a482f942dae90211540c856664ca71ba29297309 (patch) | |
| tree | bbaea97119085b9ad13346ce3b9e88b617a13896 /core | |
| parent | ac8a61b6d47e737794b2aaeaf629d87e493413b8 (diff) | |
| parent | 72b26c1fa25077b1f3367eb211be20b629f7b1d4 (diff) | |
| download | frameworks_base-a482f942dae90211540c856664ca71ba29297309.zip frameworks_base-a482f942dae90211540c856664ca71ba29297309.tar.gz frameworks_base-a482f942dae90211540c856664ca71ba29297309.tar.bz2 | |
Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java | 4 |
1 files 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 3ba2bc6..a74ecd3 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; } /** |