summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android
diff options
context:
space:
mode:
authorQi Wang <wangqi@google.com>2016-02-27 02:45:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-27 02:45:10 +0000
commit2ff80ef65ad1856c766cdd6c2e311dc4c7e19318 (patch)
treebfb32e0518d2524972e5c109d89d80cac89e6d6a /InCallUI/src/com/android
parent9cff658da23dc80786650fb0203ae4566839f18d (diff)
parent921c9a5139068df0d16cd35801f83bff9de32a02 (diff)
Merge "Add back button to dialpad in callui" into nyc-dev
Diffstat (limited to 'InCallUI/src/com/android')
-rw-r--r--InCallUI/src/com/android/incallui/DialpadFragment.java6
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;
}