diff options
author | Yorke Lee <yorkelee@google.com> | 2014-09-23 15:52:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 15:52:41 +0000 |
commit | e95d72638907fb9b3fe987db8279c048b6e6ef9d (patch) | |
tree | 2b6eba382b6a27140aaa3335660d664c052fec67 | |
parent | 9a4af6e250d10a938f2f61a5d4bc72daded33e4d (diff) | |
parent | 81af3409f38c1f44d4b54cedb43b05d17bb24dc7 (diff) |
am 81af3409: am 87c71a6a: am 66c729a4: am 764bd1f2: Merge "Add null check when auto-scrolling listView" into lmp-dev
* commit '81af3409f38c1f44d4b54cedb43b05d17bb24dc7':
Add null check when auto-scrolling listView
-rw-r--r-- | src/com/android/dialer/calllog/CallLogFragment.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index 2f0ee5370..e5c3c58a5 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -601,7 +601,7 @@ public class CallLogFragment extends AnalyticsListFragment view.getLocalVisibleRect(localVisibleRect); final int scrollingNeeded = localVisibleRect.top > 0 ? -localVisibleRect.top : view.getMeasuredHeight() - localVisibleRect.height(); - + final ListView listView = getListView(); animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { private int mCurrentScroll = 0; @@ -618,9 +618,11 @@ public class CallLogFragment extends AnalyticsListFragment view.requestLayout(); if (isExpand) { - int scrollBy = (int) (value * scrollingNeeded) - mCurrentScroll; - getListView().smoothScrollBy(scrollBy, /* duration = */ 0); - mCurrentScroll += scrollBy; + if (listView != null) { + int scrollBy = (int) (value * scrollingNeeded) - mCurrentScroll; + listView.smoothScrollBy(scrollBy, /* duration = */ 0); + mCurrentScroll += scrollBy; + } } } }); |