diff options
| author | Adam Cohen <adamcohen@google.com> | 2010-11-10 17:26:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-10 17:26:10 -0800 |
| commit | f0504eb47001d691850866088449fc6352c7ef8d (patch) | |
| tree | 8ea850ba525a6b19606938a72bceea1c1458eee1 /core/java/android/widget/StackView.java | |
| parent | 6e3d6cf2e99301d0602cb5119cf015931c88704d (diff) | |
| parent | a02fdf1ba03fad71cc80a89dfc74b17456d5b4a5 (diff) | |
Merge "Adding widget auto-advance capability"
Diffstat (limited to 'core/java/android/widget/StackView.java')
| -rw-r--r-- | core/java/android/widget/StackView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java index a27e1cc52b1c..01044d952211 100644 --- a/core/java/android/widget/StackView.java +++ b/core/java/android/widget/StackView.java @@ -674,6 +674,8 @@ public class StackView extends AdapterViewAnimator { r = Math.max(0, r); mYProgress = r; + if (mView == null) return; + final LayoutParams viewLp = (LayoutParams) mView.getLayoutParams(); final LayoutParams highlightLp = (LayoutParams) mHighlight.getLayoutParams(); @@ -722,6 +724,7 @@ public class StackView extends AdapterViewAnimator { mXProgress = r; + if (mView == null) return; final LayoutParams viewLp = (LayoutParams) mView.getLayoutParams(); final LayoutParams highlightLp = (LayoutParams) mHighlight.getLayoutParams(); |