Bug 1265433 - Pre: remove unnecessary v11 checks r=me draft
authorAndrzej Hunt <ahunt@mozilla.com>
Wed, 27 Apr 2016 12:13:52 +0200
changeset 357276 26c8c50e78e333a7aef60a452986db3109948e03
parent 357275 03eac758d8d7b0ce6b284bc1cf17512fe7a1ca2e
child 357277 0c0213bf3ffe112853c07fbda387705dab2c837b
push id16745
push userahunt@mozilla.com
push dateThu, 28 Apr 2016 11:26:07 +0000
reviewersme
bugs1265433
milestone49.0a1
Bug 1265433 - Pre: remove unnecessary v11 checks r=me MozReview-Commit-ID: LHg1QcxpwIF
mobile/android/base/java/org/mozilla/gecko/menu/GeckoMenuInflater.java
--- a/mobile/android/base/java/org/mozilla/gecko/menu/GeckoMenuInflater.java
+++ b/mobile/android/base/java/org/mozilla/gecko/menu/GeckoMenuInflater.java
@@ -125,20 +125,17 @@ public class GeckoMenuInflater extends M
         item.order = a.getInt(R.styleable.MenuItem_android_orderInCategory, 0);
         item.title = a.getText(R.styleable.MenuItem_android_title);
         item.checkable = a.getBoolean(R.styleable.MenuItem_android_checkable, false);
         item.checked = a.getBoolean(R.styleable.MenuItem_android_checked, false);
         item.visible = a.getBoolean(R.styleable.MenuItem_android_visible, true);
         item.enabled = a.getBoolean(R.styleable.MenuItem_android_enabled, true);
         item.hasSubMenu = false;
         item.iconRes = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
-
-        if (Versions.feature11Plus) {
-            item.showAsAction = a.getInt(R.styleable.MenuItem_android_showAsAction, 0);
-        }
+        item.showAsAction = a.getInt(R.styleable.MenuItem_android_showAsAction, 0);
 
         a.recycle();
     }
 
     public void setValues(ParsedItem item, MenuItem menuItem) {
         // We are blocking any presenter updates during inflation.
         GeckoMenuItem geckoItem = null;
         if (menuItem instanceof GeckoMenuItem) {