commit e8dc29f5e298505943901e92dd8186c427c57596
author Andrew Lee <anwlee@google.com> Tue Sep 23 17:01:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 23 17:01:51 2014 +0000
tree 2a69c65085ada20befac9f5bce17ca19c939ea2b
parent 764bd1f217309c0da9623ce50cec028998baab54
parent 62e1d70e9779bd120b5fb9d5e89d952b5ef9ab6b

Merge "Hide the FAB if the dialpad chooser is shown." into lmp-dev

src/com/android/dialer/calllog/CallLogFragment.java

diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 2f0ee53..e5c3c58 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -601,7 +601,7 @@
                 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 @@
                         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;
+                            }
                         }
                     }
                 });

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 91b222f..7faed07 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -838,7 +838,6 @@
             }
             mPressedDialpadKeys.add(view);
         } else {
-            view.jumpDrawablesToCurrentState();
             mPressedDialpadKeys.remove(view);
             if (mPressedDialpadKeys.isEmpty()) {
                 stopTone();