commit bb6f533a5a78b6b831dd7697436845ebcccf7d9a
author Evan Charlton <evanc@google.com> Thu Jun 05 23:15:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 05 23:15:50 2014 +0000
tree aefd62204f4b0e6e03e396dd5a999759a1962778
parent ca2f6197a1269737c4d6b1910be418400e720147
parent 561374c01312e1d2daa526a38f66f28c822573e5

am b5d832d3: Merge "Wire up DTMF post-dial" into lmp-preview-dev

* commit 'b5d832d31c9e162876a1e3bf42894324729b3982':
  Wire up DTMF post-dial

InCallUI/src/com/android/incallui/CallCardFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 8d8fc8a..5adb052 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -318,7 +318,8 @@
         }
 
         mHandoffButton.setEnabled(isHandoffCapable && !isHandoffPending);
-        mHandoffButton.setVisibility(mHandoffButton.isEnabled() ? View.VISIBLE : View.GONE);
+        mHandoffButton.setVisibility(isWiFi || mHandoffButton.isEnabled() ?
+                View.VISIBLE : View.GONE);
         mHandoffButton.setImageResource(isWiFi ?
                 R.drawable.ic_in_call_wifi : R.drawable.ic_in_call_pstn);
     }