summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-13 23:57:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 23:57:21 +0000
commitcb5003579efdae95c3bbcfe48e5cc236f8234da8 (patch)
tree2f79f86a202bd639ba7bcadf635e32fda9746a6a
parent9215d9bf6bc854e59357d5e85e7dfcd7b2fabb07 (diff)
parent4eda4c4b261a5e3bdd0ed3ab61a3272bd7a45495 (diff)
am 4eda4c4b: am 364b5735: am 82e17500: Merge "DO NOT MERGE Make dialpad slide down when dismissed by tapping outside" into klp-dev
* commit '4eda4c4b261a5e3bdd0ed3ab61a3272bd7a45495': DO NOT MERGE Make dialpad slide down when dismissed by tapping outside
-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 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);
}
}
}