From 7112b45dfc9dd83ac9478c24e0d0cbd7a063d655 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Tue, 24 Oct 2017 16:02:21 +0200
Subject: [PATCH] Removes improvements which are not related to this branch

---
 .../etalab/mastodon/activities/BaseMainActivity.java   |  2 --
 app/src/main/res/layout/activity_main.xml              | 10 ----------
 2 files changed, 12 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index b12a3e71f..fb043bd3e 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -179,9 +179,7 @@ public abstract class BaseMainActivity extends AppCompatActivity
         Helper.fillMapEmoji(getApplicationContext());
         //Here, the user is authenticated
         Toolbar toolbar = findViewById(R.id.toolbar);
-        Toolbar toolbarBottom = findViewById(R.id.toolbarBottom);
         setSupportActionBar(toolbar);
-        setSupportActionBar(toolbarBottom);
         toolbarTitle  = toolbar.findViewById(R.id.toolbar_title);
         toolbar_search = toolbar.findViewById(R.id.toolbar_search);
         tabLayout = findViewById(R.id.tabLayout);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 78e4f4b4d..0b6317ddf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -39,7 +39,6 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                app:layout_scrollFlags="scroll|enterAlways"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorPrimary"
                 android:theme="@style/AppThemeDark_NoActionBar"
@@ -111,15 +110,6 @@
             tools:context="fr.gouv.etalab.mastodon.activities.MainActivity"
             >
         </RelativeLayout>
-        <android.support.v7.widget.Toolbar
-            app:layout_scrollFlags="scroll|enterAlways"
-            android:id="@+id/toolbarBottom"
-            android:layout_gravity="bottom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            android:theme="@style/AppThemeDark_NoActionBar"
-            app:popupTheme="?attr/popupOverlay"/>
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/toot"