summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-11 23:10:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-11 23:10:54 +0000
commit80b0c11604ea909b66cd87c0fda55abc7d9ad721 (patch)
tree6a14932438e80e2123cac1bac94ea457c139276c /src
parent68dfc8263d06875d0392a3eed8f351dd851e6c70 (diff)
parent39fcd12c8d93038787ca61b461b6abbb1b79e80b (diff)
Merge "Make dialpad slide down when dismissed by tapping outside"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index ae9700f33..7762721a1 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -419,7 +419,7 @@ public class DialpadFragment extends Fragment
@Override
public boolean onTouch(View v, MotionEvent event) {
if (isDigitsEmpty()) {
- hideAndClearDialpad();
+ hideAndClearDialpad(true);
return true;
}
return false;
@@ -1059,11 +1059,11 @@ public class DialpadFragment extends Fragment
public void callVoicemail() {
startActivity(getVoicemailIntent());
- hideAndClearDialpad();
+ hideAndClearDialpad(false);
}
- private void hideAndClearDialpad() {
- ((DialtactsActivity) getActivity()).hideDialpadFragment(false, true);
+ private void hideAndClearDialpad(boolean animate) {
+ ((DialtactsActivity) getActivity()).hideDialpadFragment(animate, true);
}
public static class ErrorDialogFragment extends DialogFragment {
@@ -1158,7 +1158,7 @@ public class DialpadFragment extends Fragment
(getActivity() instanceof DialtactsActivity ?
((DialtactsActivity) getActivity()).getCallOrigin() : null));
startActivity(intent);
- hideAndClearDialpad();
+ hideAndClearDialpad(false);
}
}
}