diff options
author | Yorke Lee <yorkelee@google.com> | 2014-03-11 23:48:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 23:48:34 +0000 |
commit | 364b5735d69ac835a7e66554ecd526d7a334d9a2 (patch) | |
tree | d1d5faf8279727745db1efa50f6ae331000e0b0d | |
parent | 37f142891fa0e3edd6bdefa3f25628e4c1aa900f (diff) | |
parent | 82e17500c9757c85b84e50adf678319e2e2d2308 (diff) |
am 82e17500: Merge "DO NOT MERGE Make dialpad slide down when dismissed by tapping outside" into klp-dev
* commit '82e17500c9757c85b84e50adf678319e2e2d2308':
DO NOT MERGE Make dialpad slide down when dismissed by tapping outside
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 10 |
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 599604b2c..a1844236d 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -420,7 +420,7 @@ public class DialpadFragment extends Fragment @Override public boolean onTouch(View v, MotionEvent event) { if (isDigitsEmpty()) { - hideAndClearDialpad(); + hideAndClearDialpad(true); return true; } return false; @@ -1054,11 +1054,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 { @@ -1154,7 +1154,7 @@ public class DialpadFragment extends Fragment (getActivity() instanceof DialtactsActivity ? ((DialtactsActivity) getActivity()).getCallOrigin() : null)); startActivity(intent); - hideAndClearDialpad(); + hideAndClearDialpad(false); } } } |