From 7914aa5c08d25306be0def7873fe850514e89cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 16:05:18 +0100
Subject: Toolbar fixes, Toolbar under status bar on Lollipop

---
 OpenKeychain/src/main/res/layout/upload_key_activity.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/upload_key_activity.xml')

diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 342052bdd..19e37783b 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-- 
cgit v1.2.3