corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cked out changesets 10bdfbe0195b and 06b0f332039d (bug 858687) because of Robocop failures (r=backout)

Browse Source
This commit is contained in:
Lucas Rocha
2013-04-24 22:53:31 +01:00
parent 0f9731d61f
commit d3d1a792aa
14 changed files with 763 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/BrowserApp.java
View File

@@ -342,7 +342,7 @@ abstract public class BrowserApp extends GeckoApp
super.onCreate(savedInstanceState);
RelativeLayout actionBar = (RelativeLayout) getActionBarLayout();
LinearLayout actionBar = (LinearLayout) getActionBarLayout();
mMainLayout.addView(actionBar, 2);
((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener());
@@ -683,9 +683,16 @@ abstract public class BrowserApp extends GeckoApp
}
public View getActionBarLayout() {
RelativeLayout actionBar = (RelativeLayout) LayoutInflater.from(this).inflate(R.layout.browser_toolbar_menu, null);
actionBar.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT,
(int) getResources().getDimension(R.dimen.browser_toolbar_height)));
int actionBarRes;
if (!HardwareUtils.hasMenuButton() || HardwareUtils.isTablet())
actionBarRes = R.layout.browser_toolbar_menu;
else
actionBarRes = R.layout.browser_toolbar;
LinearLayout actionBar = (LinearLayout) LayoutInflater.from(this).inflate(actionBarRes, null);
actionBar.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT,
(int) getResources().getDimension(R.dimen.browser_toolbar_height)));
return actionBar;
}