wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 695332 - Fix browser toolbar id for consistency (r=sriram)

Browse Source
This commit is contained in:
Lucas Rocha 2011-10-25 14:06:51 +01:00
parent 37221e4943
commit c0d052138f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embedding/android/GeckoApp.java
View File

@ -935,7 +935,6 @@ abstract public class GeckoApp
// setup gecko layout // setup gecko layout
mGeckoLayout = (RelativeLayout) findViewById(R.id.geckoLayout); mGeckoLayout = (RelativeLayout) findViewById(R.id.geckoLayout);
mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browserToolbar);
mDoorHanger = new DoorHanger(this); mDoorHanger = new DoorHanger(this);
Tab tab = Tabs.getInstance().getSelectedTab(); Tab tab = Tabs.getInstance().getSelectedTab();
@ -982,7 +981,7 @@ abstract public class GeckoApp
} }
mMainLayout = (LinearLayout) findViewById(R.id.mainLayout); mMainLayout = (LinearLayout) findViewById(R.id.mainLayout);
mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browserToolbar); mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
//register for events //register for events
GeckoAppShell.registerGeckoEventListener("DOMContentLoaded", GeckoApp.mAppContext); GeckoAppShell.registerGeckoEventListener("DOMContentLoaded", GeckoApp.mAppContext);

2
embedding/android/resources/layout/gecko_app.xml
View File

@ -3,7 +3,7 @@
android:id="@+android:id/mainLayout" android:id="@+android:id/mainLayout"
style="@style/Screen"> style="@style/Screen">
<org.mozilla.gecko.BrowserToolbar android:id="@+android:id/browserToolbar" <org.mozilla.gecko.BrowserToolbar android:id="@+id/browser_toolbar"
style="@style/BrowserToolbar"/> style="@style/BrowserToolbar"/>
<RelativeLayout android:id="@+android:id/geckoLayout" <RelativeLayout android:id="@+android:id/geckoLayout"