commit d78cc6ae6f6dc86a7d8c974b79a5c7f6e30f6933
author Qi Wang <wangqi@google.com> Sat Feb 27 02:52:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 27 02:52:20 2016 +0000
tree 0b04ed2f08f29b125d13cade50f6b2b7d0b890fe
parent 20917c43dd541b58b337afa63bec7b1546f33af1
parent 25c55157c416fcd8371f691bb6aa1e47d5d2a62d

Merge "Add back button to dialpad in callui" into nyc-dev am: 2ff80ef65a
am: 25c55157c4

* commit '25c55157c416fcd8371f691bb6aa1e47d5d2a62d':
  Add back button to dialpad in callui

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

diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index ae66a49..ad288bd 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -323,6 +323,9 @@
                 }, ACCESSIBILITY_DTMF_STOP_DELAY_MILLIS);
             }
         }
+        if (v.getId() == R.id.dialpad_back) {
+            getActivity().onBackPressed();
+        }
     }
 
     @Override
@@ -437,6 +440,9 @@
             mDtmfDialerField.setElegantTextHeight(false);
             configureKeypadListeners();
         }
+        View backButton = mDialpadView.findViewById(R.id.dialpad_back);
+        backButton.setVisibility(View.VISIBLE);
+        backButton.setOnClickListener(this);
 
         return parent;
     }