commit f2c5004155fd55f23317946a956f41303ee8101b
author Ihab Awad <ihab@google.com> Thu Dec 18 16:30:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 18 16:30:19 2014 +0000
tree b0d882cb25aae674e1e7bd6a8d0013a7e970cc16
parent 7594d78c155773244ad1ef714e75f1ed30b51c15
parent 0bbd606a3d1da11a38fdc127f4067b06f71174f8

Merge "Improve Talkback for "Speed dial" user interface" into lmp-mr1-dev

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

diff --git a/src/com/android/dialer/calllog/ClearCallLogDialog.java b/src/com/android/dialer/calllog/ClearCallLogDialog.java
index e6b4ce2..f4c75d1 100644
--- a/src/com/android/dialer/calllog/ClearCallLogDialog.java
+++ b/src/com/android/dialer/calllog/ClearCallLogDialog.java
@@ -67,7 +67,13 @@
                     }
                     @Override
                     protected void onPostExecute(Void result) {
-                        progressDialog.dismiss();
+                        if (getActivity() == null || getActivity().isDestroyed()) {
+                            return;
+                        }
+
+                        if (progressDialog != null && progressDialog.isShowing()) {
+                            progressDialog.dismiss();
+                        }
                     }
                 };
                 // TODO: Once we have the API, we should configure this ProgressDialog

src/com/android/dialer/widget/OverlappingPaneLayout.java

diff --git a/src/com/android/dialer/widget/OverlappingPaneLayout.java b/src/com/android/dialer/widget/OverlappingPaneLayout.java
index 95a0e43..8f911c2 100644
--- a/src/com/android/dialer/widget/OverlappingPaneLayout.java
+++ b/src/com/android/dialer/widget/OverlappingPaneLayout.java
@@ -230,7 +230,6 @@
         setWillNotDraw(false);
 
         ViewCompat.setAccessibilityDelegate(this, new AccessibilityDelegate());
-        ViewCompat.setImportantForAccessibility(this, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES);
 
         mDragHelper = ViewDragHelper.create(this, 0.5f, new DragHelperCallback());
         mDragHelper.setMinVelocity(MIN_FLING_VELOCITY * density);