commit e4de90c6d908fe4926d8efbcd89d17b12fd05d00
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 21 18:56:40 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 21 18:56:42 2017 +0000
tree b23028a3539809258fa9b35319546be4599d9353
parent ea7890cd5e829ed3f0b5f726561c569690af2030
parent d9859a7eb008196ba91073645567ab9212a82f17

Merge "Dismiss popup menu when show dialpad chooser." into oc-dr1-dev

java/com/android/dialer/app/dialpad/DialpadFragment.java

diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java
index d339437..3cd3ac2 100644
--- a/java/com/android/dialer/app/dialpad/DialpadFragment.java
+++ b/java/com/android/dialer/app/dialpad/DialpadFragment.java
@@ -1185,6 +1185,10 @@
         mDialpadView.setVisibility(View.GONE);
       }
 
+      if (mOverflowPopupMenu != null) {
+        mOverflowPopupMenu.dismiss();
+      }
+
       mFloatingActionButtonController.setVisible(false);
       mDialpadChooser.setVisibility(View.VISIBLE);