diff --git a/CLOBBER b/CLOBBER index 1ab3b1aebdc..213bbc121ff 100644 --- a/CLOBBER +++ b/CLOBBER @@ -18,4 +18,4 @@ # Modifying this file will now automatically clobber the buildbot machines \o/ # -Add an WebIDL interface for bug 892978 requires a clobber for Windows. +Changed a resource file in fennec, bug 880259 \ No newline at end of file diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java index cb5b7ac0b61..6b94691ed30 100644 --- a/mobile/android/base/GeckoView.java +++ b/mobile/android/base/GeckoView.java @@ -31,9 +31,9 @@ public class GeckoView extends LayerView public GeckoView(Context context, AttributeSet attrs) { super(context, attrs); - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.GeckoView); String url = a.getString(R.styleable.GeckoView_url); + boolean doInit = a.getBoolean(R.styleable.GeckoView_doinit, true); a.recycle(); if (url != null) { @@ -46,27 +46,23 @@ public class GeckoView extends LayerView Tabs tabs = Tabs.getInstance(); tabs.attachToContext(context); } - GeckoProfile profile = GeckoProfile.get(context); - BrowserDB.initialize(profile.getName()); GeckoAppShell.registerEventListener("Gecko:Ready", this); ThreadUtils.setUiThread(Thread.currentThread(), new Handler()); initializeView(GeckoAppShell.getEventDispatcher()); + + if (!doInit) + return; + + GeckoProfile profile = GeckoProfile.get(context); + BrowserDB.initialize(profile.getName()); + if (GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.Launched)) { GeckoAppShell.setLayerView(this); GeckoThread.createAndStart(); } } - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - - if (hasFocus) { - setBackgroundDrawable(null); - } - } - public void loadUrl(String uri) { Tabs.getInstance().loadUrl(uri); } diff --git a/mobile/android/base/resources/layout/shared_ui_components.xml b/mobile/android/base/resources/layout/shared_ui_components.xml index 964cf4283e4..5c3d807f229 100644 --- a/mobile/android/base/resources/layout/shared_ui_components.xml +++ b/mobile/android/base/resources/layout/shared_ui_components.xml @@ -6,11 +6,13 @@ - + - + +