Bug 1265433 - Pre: Remove unnecessary v11 checks. r=sebastian, a=sledru
authorAndrzej Hunt <ahunt@mozilla.com>
Wed, 27 Apr 2016 12:13:52 +0200
changeset 333164 fae69cba7787806bba92333b34b202786cd04f0a
parent 333163 2517414f318f3b31d37dfd0cda30685245399c36
child 333165 491692205417d9e1bd358608cbd959a179bfed2f
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian, sledru
bugs1265433
milestone48.0a2
Bug 1265433 - Pre: Remove unnecessary v11 checks. r=sebastian, a=sledru 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) {