commit 8c30c2ce74427677a0d1b83f686da4c7f0fe9f46
author Baligh Uddin <baligh@google.com> Tue Mar 25 16:48:37 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 25 16:48:37 2014 +0000
tree 76b67e2d204353e487ffb4de7983db46bcb45fe0
parent 5dba48f2c8e6ef39562f91b0c98ea9b845144590
parent 2ae10d439f3e57f3c533d576f4c15442c8baf1ec

Merge "Import translations. DO NOT MERGE" into klp-dev

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index ade5199..b78a7bc 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -1008,7 +1008,9 @@
 
     @Override
     public void setDialButtonEnabled(boolean enabled) {
-        mDialButton.setEnabled(enabled);
+        if (mDialButton != null) {
+            mDialButton.setEnabled(enabled);
+        }
     }
 
     @Override

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 d25ffef..83cfbd8 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1563,6 +1563,9 @@
      * Update the enabledness of the "Dial" and "Backspace" buttons if applicable.
      */
     private void updateDialAndDeleteButtonEnabledState() {
+        if (getActivity() == null) {
+            return;
+        }
         final boolean digitsNotEmpty = !isDigitsEmpty();
         mDelete.setEnabled(digitsNotEmpty);
         // On CDMA phones, if we're already on a call, we *always* enable the Dial button (since