Merge pull request #40 from google/restore_content_main

Resotre the content_main.xml that accidentaly commited to wrap the FlexboxLayout by a ScrollView

app/src/main/res/layout/content_main.xml

@@ -13,43 +13,37 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/flexbox_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:flexWrap="wrap"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:showIn="@layout/activity_main">
 
-    <com.google.android.flexbox.FlexboxLayout
-        android:id="@+id/flexbox_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:flexWrap="wrap"
-        app:alignItems="flex_start"
-        app:alignContent="flex_start"
-        android:padding="16dp">
-
-        <TextView
-            android:id="@+id/textview1"
-            android:layout_width="@dimen/flex_item_length2"
-            android:layout_height="@dimen/flex_item_length"
-            android:text="@string/one"
-            style="@style/FlexItem" />
-
-        <TextView
-            android:id="@+id/textview2"
-            android:layout_width="@dimen/flex_item_length3"
-            android:layout_height="@dimen/flex_item_length"
-            android:text="@string/two"
-            style="@style/FlexItem" />
-
-        <TextView
-            android:id="@+id/textview3"
-            android:layout_width="@dimen/flex_item_length"
-            android:layout_height="@dimen/flex_item_length"
-            android:text="@string/three"
-            style="@style/FlexItem" />
-
-    </com.google.android.flexbox.FlexboxLayout>
-</ScrollView>
+    <TextView
+        android:id="@+id/textview1"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length2"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/one" />
+
+    <TextView
+        android:id="@+id/textview2"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length3"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/two" />
+
+    <TextView
+        android:id="@+id/textview3"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/three" />
+
+</com.google.android.flexbox.FlexboxLayout>