From a41b78973db3dfde159f7d641f794f462ad323d3 Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Tue, 9 Jun 2015 13:36:44 +0000
Subject: 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
---
 core/java/android/view/MenuInflater.java | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'core/java/android/view/MenuInflater.java')

diff --git a/core/java/android/view/MenuInflater.java b/core/java/android/view/MenuInflater.java
index dc8cadf..1c67ba7 100644
--- a/core/java/android/view/MenuInflater.java
+++ b/core/java/android/view/MenuInflater.java
@@ -25,11 +25,8 @@ import android.annotation.MenuRes;
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
@@ -337,11 +334,6 @@ public class MenuInflater {
         
         private ActionProvider itemActionProvider;
 
-        private ColorStateList itemIconTintList;
-        private boolean itemIconTintListSet;
-        private PorterDuff.Mode itemIconTintMode;
-        private boolean itemIconTintModeSet;
-
         private static final int defaultGroupId = NO_ID;
         private static final int defaultItemId = NO_ID;
         private static final int defaultItemCategory = 0;
@@ -432,23 +424,6 @@ public class MenuInflater {
                 itemActionProvider = null;
             }
 
-            if (a.hasValueOrEmpty(com.android.internal.R.styleable.MenuItem_iconTint)) {
-                itemIconTintList = a.getColorStateList(
-                        com.android.internal.R.styleable.MenuItem_iconTint);
-                itemIconTintListSet = true;
-            } else {
-                itemIconTintList = null;
-                itemIconTintListSet = false;
-            }
-            if (a.hasValueOrEmpty(com.android.internal.R.styleable.MenuItem_iconTintMode)) {
-                itemIconTintMode = Drawable.parseTintMode(
-                        a.getInt(com.android.internal.R.styleable.MenuItem_iconTintMode, -1), null);
-                itemIconTintModeSet = true;
-            } else {
-                itemIconTintMode = null;
-                itemIconTintModeSet = false;
-            }
-
             a.recycle();
 
             itemAdded = false;
@@ -511,13 +486,6 @@ public class MenuInflater {
             if (itemActionProvider != null) {
                 item.setActionProvider(itemActionProvider);
             }
-
-            if (itemIconTintListSet) {
-                item.setIconTintList(itemIconTintList);
-            }
-            if (itemIconTintModeSet) {
-                item.setIconTintMode(itemIconTintMode);
-            }
         }
 
         public MenuItem addItem() {
-- 
cgit v1.1