Merge remote-tracking branch 'development' into linked-identities

1 files changed, 4 insertions, 22 deletions

diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
index 0336b51fd..b8c190a36 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
@@ -1,31 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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/toolbar_include"
     android:elevation="4dp"
+    android:background="@color/android_orange_light"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <!--
-        We always have windowTranslucentStatus=true to get under the status bar.
-        Thus this ImageView is the part under the status bar!
-    -->
-    <ImageView
-        android:id="@+id/status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/statusbar_height"
-        android:background="@color/android_orange_light" />
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_below="@+id/status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
-        android:background="@color/android_orange_light"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        tools:ignore="UnusedAttribute" />
+    <include
+        android:id="@+id/toolbar_inner_layout"
+        layout="@layout/toolbar_inner_layout" />
 
 </RelativeLayout>