API council review feedback for ActionMenuView

Reverts "MenuItem, navigation and overflow icon tinting" CL,
and adds getter and setter for the overflow icon to ActionMenuView
and Toolbar.

BUG: 21571899

Change-Id: I591f43650356443fa3256e4d74e28b6ddd8c2b33

1 files changed, 23 insertions, 27 deletions

diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java
index 278a8fb..1f02c3b 100644
--- a/core/java/android/widget/ActionMenuView.java
+++ b/core/java/android/widget/ActionMenuView.java
@@ -16,11 +16,11 @@
 package android.widget;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.StyleRes;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.content.res.Configuration;
-import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
@@ -541,39 +541,35 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
         dismissPopupMenus();
     }
 
-    /** @hide */
-    public boolean isOverflowReserved() {
-        return mReserveOverflow;
-    }
-
-    /** @hide */
-    public void setOverflowReserved(boolean reserveOverflow) {
-        mReserveOverflow = reserveOverflow;
-    }
-
     /**
-     * Applies a tint to the overflow drawable. Does not modify the current tint
-     * mode, which is {@link PorterDuff.Mode#SRC_IN} by default.
+     * Set the icon to use for the overflow button.
      *
-     * @param tint the tint to apply, may be {@code null} to clear tint
+     * @param icon Drawable to set, may be null to clear the icon
      */
-    public void setOverflowTintList(ColorStateList tint) {
-        if (mPresenter != null) {
-            mPresenter.setOverflowTintList(tint);
-        }
+    public void setOverflowIcon(@Nullable Drawable icon) {
+        getMenu();
+        mPresenter.setOverflowIcon(icon);
     }
 
     /**
-     * Specifies the blending mode used to apply the tint specified by {@link
-     * #setOverflowTintList(ColorStateList)} to the overflow drawable.
-     * The default mode is {@link PorterDuff.Mode#SRC_IN}.
+     * Return the current drawable used as the overflow icon.
      *
-     * @param tintMode the blending mode used to apply the tint, may be {@code null} to clear tint
+     * @return The overflow icon drawable
      */
-    public void setOverflowTintMode(PorterDuff.Mode tintMode) {
-        if (mPresenter != null) {
-            mPresenter.setOverflowTintMode(tintMode);
-        }
+    @Nullable
+    public Drawable getOverflowIcon() {
+        getMenu();
+        return mPresenter.getOverflowIcon();
+    }
+
+    /** @hide */
+    public boolean isOverflowReserved() {
+        return mReserveOverflow;
+    }
+
+    /** @hide */
+    public void setOverflowReserved(boolean reserveOverflow) {
+        mReserveOverflow = reserveOverflow;
     }
 
     @Override