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

am: 25c55157c4

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

1 files changed, 6 insertions, 0 deletions

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