From 8e31c3ef143f391b2360fd8f16ea68af9151d122 Mon Sep 17 00:00:00 2001
From: Nader Jawad <njawad@google.com>
Date: Sun, 14 Apr 2019 21:58:04 -0700
Subject: Added BlendMode equivalent APIs to replace deprecated PorterDuff
 variants

Updated various framework Views to have equivalent BlendMode APIs
to replace the deprecated PorterDuff equivalents.
Updated InspectableProperty annotations to refer to the same
xml attributes as the original tintmode APIs

Bug: 126726419
Test: Added CTS tests to verify new BlendMode APIs
Change-Id: Id9ab36d3d4d29f351250723e9d13d49bc6062c83
---
 core/java/android/view/MenuInflater.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 8b3b10f48a4a..b6b11ab9249b 100644
--- a/core/java/android/view/MenuInflater.java
+++ b/core/java/android/view/MenuInflater.java
@@ -488,7 +488,7 @@ public class MenuInflater {
             }
 
             if (mItemIconBlendMode != null) {
-                item.setIconTintMode(mItemIconBlendMode);
+                item.setIconTintBlendMode(mItemIconBlendMode);
             }
 
             if (itemIconTintList != null) {
-- 
cgit v1.2.3