diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-11 20:05:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-11 20:05:36 +0000 |
commit | 03249752afd7d870ff708bf47d687a1643367ec5 (patch) | |
tree | f0b6004c5f2d035f0f4c177455bea79c5047d1a4 /java/com/android/dialer/dialpadview | |
parent | 3f14c296552a7af353094e420aa00dd0bf217268 (diff) | |
parent | 21e24b6d9355e5e64a594b3b32cb4c8301e3330b (diff) |
Merge changes I6af1fc7d,I0627d54a
* changes:
Automated g4 rollback of changelist 167310802.
Automated g4 rollback of changelist 167332236.
Diffstat (limited to 'java/com/android/dialer/dialpadview')
-rw-r--r-- | java/com/android/dialer/dialpadview/DialpadFragment.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java index 837c3af90..86a83796e 100644 --- a/java/com/android/dialer/dialpadview/DialpadFragment.java +++ b/java/com/android/dialer/dialpadview/DialpadFragment.java @@ -1001,12 +1001,12 @@ public class DialpadFragment extends Fragment DialerUtils.startActivityWithErrorToast( getActivity(), new CallIntentBuilder(CallUtil.getVoicemailUri(), CallInitiationType.Type.DIALPAD).build()); - hideAndClearDialpad(); + hideAndClearDialpad(false); } - private void hideAndClearDialpad() { + private void hideAndClearDialpad(boolean animate) { LogUtil.enterBlock("DialpadFragment.hideAndClearDialpad"); - FragmentUtils.getParentUnsafe(this, DialpadListener.class).onCallPlacedFromDialpad(); + FragmentUtils.getParentUnsafe(this, DialpadListener.class).hideDialpadFragment(animate, true); } /** @@ -1053,7 +1053,7 @@ public class DialpadFragment extends Fragment final Intent intent = new CallIntentBuilder(number, CallInitiationType.Type.DIALPAD).build(); DialerUtils.startActivityWithErrorToast(getActivity(), intent); - hideAndClearDialpad(); + hideAndClearDialpad(false); } } } @@ -1297,7 +1297,7 @@ public class DialpadFragment extends Fragment return true; } else if (resId == R.id.menu_call_with_note) { CallSubjectDialog.start(getActivity(), mDigits.getText().toString()); - hideAndClearDialpad(); + hideAndClearDialpad(false); return true; } else { return false; @@ -1710,7 +1710,7 @@ public class DialpadFragment extends Fragment void onDialpadShown(); - void onCallPlacedFromDialpad(); + void hideDialpadFragment(boolean animate, boolean value); } /** Callback for async lookup of the last number dialed. */ |