Bug 1288106 - Fix ActivityStream layout initialisation
MozReview-Commit-ID: F5tdUwqVw0P
--- 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