diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-21 19:04:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-21 19:04:21 +0000 |
| commit | cccd0a85972832da635a8f72536ccca263160d68 (patch) | |
| tree | b23028a3539809258fa9b35319546be4599d9353 /java/com/android/dialer/app | |
| parent | 0a7b301e28d227400f21143a8027ab6580057d01 (diff) | |
| parent | e4de90c6d908fe4926d8efbcd89d17b12fd05d00 (diff) | |
Merge "Dismiss popup menu when show dialpad chooser." into oc-dr1-dev
am: e4de90c6d9
Change-Id: I3c2ef89d2548ea0cb5a169b7dd1bebbf6014afa7
Diffstat (limited to 'java/com/android/dialer/app')
| -rw-r--r-- | java/com/android/dialer/app/dialpad/DialpadFragment.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java index d33943773..3cd3ac27c 100644 --- a/java/com/android/dialer/app/dialpad/DialpadFragment.java +++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java @@ -1185,6 +1185,10 @@ public class DialpadFragment extends Fragment mDialpadView.setVisibility(View.GONE); } + if (mOverflowPopupMenu != null) { + mOverflowPopupMenu.dismiss(); + } + mFloatingActionButtonController.setVisible(false); mDialpadChooser.setVisibility(View.VISIBLE); |