diff options
author | Yorke Lee <yorkelee@google.com> | 2014-03-14 00:03:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 00:03:44 +0000 |
commit | 3c3fe91acda289dc4c0653122db5e708a74e103f (patch) | |
tree | 2f79f86a202bd639ba7bcadf635e32fda9746a6a | |
parent | 6599bec1137908b8c1202cf8cf6c7866479511b9 (diff) | |
parent | cb5003579efdae95c3bbcfe48e5cc236f8234da8 (diff) |
am cb500357: am 4eda4c4b: am 364b5735: am 82e17500: Merge "DO NOT MERGE Make dialpad slide down when dismissed by tapping outside" into klp-dev
* commit 'cb5003579efdae95c3bbcfe48e5cc236f8234da8':
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); } } } |