diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index 9c47d2ceb24..16246510e60 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -1656,7 +1656,8 @@ abstract public class BrowserApp extends GeckoApp // Don't show the banner in guest mode. if (!getProfile().inGuestMode()) { - final HomeBanner homeBanner = (HomeBanner) findViewById(R.id.home_banner); + final ViewStub homeBannerStub = (ViewStub) findViewById(R.id.home_banner_stub); + final HomeBanner homeBanner = (HomeBanner) homeBannerStub.inflate(); mHomePager.setBanner(homeBanner); // Remove the banner from the view hierarchy if it is dismissed. diff --git a/mobile/android/base/home/HomeBanner.java b/mobile/android/base/home/HomeBanner.java index 63347df42c9..d4717e4d629 100644 --- a/mobile/android/base/home/HomeBanner.java +++ b/mobile/android/base/home/HomeBanner.java @@ -70,7 +70,7 @@ public class HomeBanner extends LinearLayout public HomeBanner(Context context, AttributeSet attrs) { super(context, attrs); - LayoutInflater.from(context).inflate(R.layout.home_banner, this); + LayoutInflater.from(context).inflate(R.layout.home_banner_content, this); mTextView = (TextView) findViewById(R.id.text); mIconView = (ImageView) findViewById(R.id.icon); diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml index d89fab474c0..e80c4290035 100644 --- a/mobile/android/base/resources/layout/gecko_app.xml +++ b/mobile/android/base/resources/layout/gecko_app.xml @@ -36,17 +36,12 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"/> - + diff --git a/mobile/android/base/resources/layout/home_banner.xml b/mobile/android/base/resources/layout/home_banner.xml index cc2e34b1cd9..8280a727f38 100644 --- a/mobile/android/base/resources/layout/home_banner.xml +++ b/mobile/android/base/resources/layout/home_banner.xml @@ -3,34 +3,13 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - - - - - - + diff --git a/mobile/android/base/resources/layout/home_banner_content.xml b/mobile/android/base/resources/layout/home_banner_content.xml new file mode 100644 index 00000000000..cc2e34b1cd9 --- /dev/null +++ b/mobile/android/base/resources/layout/home_banner_content.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + +