From d8ff737fc5392362707ad70fbe964ac9e299457f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 13 Jan 2015 23:15:13 +0100
Subject: Use Toolbar and new BaseActivity

---
 .../src/main/res/layout/api_apps_list_content.xml      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
index 9f9b99045..e1922079c 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <FrameLayout
+        android:layout_below="@id/toolbar"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/content_frame"
         android:layout_marginLeft="@dimen/drawer_content_padding"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <fragment
+        <fragment
             android:id="@+id/crypto_consumers_list_fragment"
             android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-</FrameLayout>
\ No newline at end of file
+            android:layout_height="match_parent" />
+    </FrameLayout>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3