Bug 1288106 - Fix ActivityStream layout initialisation draft
authorAndrzej Hunt <ahunt@mozilla.com>
Tue, 02 Aug 2016 19:29:20 -0700
changeset 396753 b27eacf97bfee429d36c4d975cbcf8d9d6a8c8be
parent 396752 bafcaae648302ea488f5a31d57c6353610d4d2fa
child 396754 2b4759c227e0dc730e35d540824bcf2ed72c5932
push id25099
push userjonalmeida942@gmail.com
push dateThu, 04 Aug 2016 13:06:07 +0000
bugs1288106
milestone51.0a1
Bug 1288106 - Fix ActivityStream layout initialisation MozReview-Commit-ID: F5tdUwqVw0P
mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStream.java
mobile/android/base/resources/layout/activity_stream.xml
mobile/android/base/resources/layout/as_content.xml
--- a/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStream.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/activitystream/ActivityStream.java
@@ -18,16 +18,18 @@ import org.mozilla.gecko.animation.Prope
 import org.mozilla.gecko.home.HomeBanner;
 import org.mozilla.gecko.home.HomeFragment;
 import org.mozilla.gecko.home.HomeScreen;
 
 public class ActivityStream extends FrameLayout implements HomeScreen {
 
     public ActivityStream(Context context, AttributeSet attrs) {
         super(context, attrs);
+
+        inflate(context, R.layout.as_content, this);
     }
 
     @Override
     public boolean isVisible() {
         // This is dependent on the loading state - currently we're a dumb panel so we're always
         // "visible"
         return true;
     }
--- a/mobile/android/base/resources/layout/activity_stream.xml
+++ b/mobile/android/base/resources/layout/activity_stream.xml
@@ -5,9 +5,9 @@
                                                       android:layout_height="match_parent"
                                                       android:background="@android:color/white">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-</org.mozilla.gecko.home.activitystream.ActivityStream>
\ No newline at end of file
+</org.mozilla.gecko.home.activitystream.ActivityStream>
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/layout/as_content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       android:background="@android:color/white">
+
+</merge>
\ No newline at end of file