Bug 1288106 - Fix ActivityStream layout initialisation r=jonalmeida
authorAndrzej Hunt <ahunt@mozilla.com>
Tue, 02 Aug 2016 19:29:20 -0700
changeset 336329 873e1bd0833abf954ac0e0fab6c43b1ce5380e1c
parent 336328 cba664ef3a3ea8702508239b463fc8014bbb228b
child 336330 0becc8c0fd30a2ac5bc1f34d80fea7b7afa4b97a
push id10033
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:50:26 +0000
treeherdermozilla-aurora@5dddbefdf759 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonalmeida
bugs1288106
milestone51.0a1
Bug 1288106 - Fix ActivityStream layout initialisation r=jonalmeida 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
@@ -16,16 +16,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
@@ -8,9 +8,9 @@
 
     <TextView
         tools:ignore="HardcodedText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Activity Stream \\o/"
         android:id="@+id/textView"
         android:layout_gravity="center_horizontal"/>
-</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