summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/app
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-06-21 19:06:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-21 19:06:51 +0000
commit0d2f33fdd7303d13510f1c43b6448d625110a204 (patch)
treec1f6c666cbd367e9f559ab4296f25dbe279d5f33 /java/com/android/dialer/app
parentf0a8ccfcd370d26b3887fc8428dedf5596f42ca8 (diff)
parentcccd0a85972832da635a8f72536ccca263160d68 (diff)
Merge "Dismiss popup menu when show dialpad chooser." into oc-dr1-dev am: e4de90c6d9
am: cccd0a8597 Change-Id: I56fa753c4191d6969b75f4e22b2013eb56655a9f
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r--java/com/android/dialer/app/dialpad/DialpadFragment.java4
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);