commit 2ff80ef65ad1856c766cdd6c2e311dc4c7e19318
author Qi Wang <wangqi@google.com> Sat Feb 27 02:45:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 27 02:45:10 2016 +0000
tree bfb32e0518d2524972e5c109d89d80cac89e6d6a
parent 9cff658da23dc80786650fb0203ae4566839f18d
parent 921c9a5139068df0d16cd35801f83bff9de32a02

Merge "Add back button to dialpad in callui" into nyc-dev

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;
     }