Merge m-c to fx-team.

This commit is contained in:
Ryan VanderMeulen 2014-01-15 20:48:45 -05:00
commit 629df645c7

View File

@ -190,9 +190,6 @@ public class BrowserToolbar extends GeckoRelativeLayout
mTabs = (ShapedButton) findViewById(R.id.tabs); mTabs = (ShapedButton) findViewById(R.id.tabs);
mTabsCounter = (TabCounter) findViewById(R.id.tabs_counter); mTabsCounter = (TabCounter) findViewById(R.id.tabs_counter);
if (Build.VERSION.SDK_INT >= 11) {
mTabsCounter.setLayerType(View.LAYER_TYPE_HARDWARE, null);
}
mBack = (ImageButton) findViewById(R.id.back); mBack = (ImageButton) findViewById(R.id.back);
setButtonEnabled(mBack, false); setButtonEnabled(mBack, false);