1 files changed, 18 insertions, 5 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/MainToolbarMenu.java b/java/com/android/dialer/main/impl/toolbar/MainToolbarMenu.java
index 3c6e3611d..16aa7c580 100644
--- a/java/com/android/dialer/main/impl/toolbar/MainToolbarMenu.java
+++ b/java/com/android/dialer/main/impl/toolbar/MainToolbarMenu.java
@@ -17,9 +17,13 @@
 package com.android.dialer.main.impl.toolbar;
 
 import android.content.Context;
-import android.support.v7.widget.PopupMenu;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Gravity;
+import android.view.MenuItem;
 import android.view.View;
+import android.widget.PopupMenu;
+import com.android.dialer.simulator.Simulator;
+import com.android.dialer.simulator.SimulatorComponent;
 
 /** Popup menu accessible from the search bar */
 public final class MainToolbarMenu extends PopupMenu {
@@ -28,9 +32,18 @@ public final class MainToolbarMenu extends PopupMenu {
     super(context, anchor, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0);
   }
 
-  @Override
-  public void show() {
-    super.show();
-    // TODO(calderwoodra): show simulator buttons
+  public void showClearFrequents(boolean show) {
+    getMenu().findItem(R.id.clear_frequents).setVisible(show);
+  }
+
+  public void maybeShowSimulator(AppCompatActivity activity) {
+    MenuItem simulatorMenuItem = getMenu().findItem(R.id.menu_simulator_submenu);
+    Simulator simulator = SimulatorComponent.get(activity).getSimulator();
+    if (simulator.shouldShow()) {
+      simulatorMenuItem.setVisible(true);
+      simulatorMenuItem.setActionProvider(simulator.getActionProvider(activity));
+    } else {
+      simulatorMenuItem.setVisible(false);
+    }
   }
 }