diff options
author | Qi Wang <wangqi@google.com> | 2016-02-27 02:52:20 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-27 02:52:20 +0000 |
commit | d78cc6ae6f6dc86a7d8c974b79a5c7f6e30f6933 (patch) | |
tree | 0b04ed2f08f29b125d13cade50f6b2b7d0b890fe /InCallUI/src | |
parent | 20917c43dd541b58b337afa63bec7b1546f33af1 (diff) | |
parent | 25c55157c416fcd8371f691bb6aa1e47d5d2a62d (diff) |
Merge "Add back button to dialpad in callui" into nyc-dev am: 2ff80ef65a
am: 25c55157c4
* commit '25c55157c416fcd8371f691bb6aa1e47d5d2a62d':
Add back button to dialpad in callui
Diffstat (limited to 'InCallUI/src')
-rw-r--r-- | InCallUI/src/com/android/incallui/DialpadFragment.java | 6 |
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; } |