From d7ce6e6088c592ae4f7a82f81f062a1b1244c685 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Wed, 17 Jan 2018 22:32:50 -0600
Subject: [PATCH] Improved SettingsActivity layout

---
 app/src/main/res/layout/activity_settings.xml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e3a44b9..6bd5fc5 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -15,18 +15,14 @@
         android:background="@color/colorPrimary"
         app:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:id="@+id/toolbar_layout"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:contentScrim="@color/transparent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:toolbarId="@+id/toolbar">
+            android:layout_height="match_parent">
 
             <SurfaceView
                 android:id="@+id/surface_view"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"/>
 
             <View
                 android:layout_width="match_parent"
@@ -39,7 +35,6 @@
                 android:layout_height="?attr/actionBarSize"
                 android:background="@color/transparent"
                 android:layout_marginTop="8dp"
-                app:layout_collapseMode="none"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 
                 <android.support.constraint.ConstraintLayout
@@ -82,15 +77,13 @@
 
                 </android.support.constraint.ConstraintLayout>
 
-
             </android.support.v7.widget.Toolbar>
 
             <android.support.design.widget.TabLayout
                 android:id="@+id/tabs"
-                android:layout_gravity="bottom"
+                android:layout_alignParentBottom="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_collapseMode="pin"
                 android:animateLayoutChanges="true">
 
                 <android.support.design.widget.TabItem
@@ -119,14 +112,13 @@
 
             </android.support.design.widget.TabLayout>
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </RelativeLayout>
 
     </android.support.design.widget.AppBarLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="?attr/actionBarSize"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <android.support.v4.view.ViewPager