From 2e3545949ba9ab48ed21cb2198c9f0d2b8691ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 13 Jan 2015 21:55:53 +0100
Subject: Start working on Material Design

---
 .../src/main/res/layout/key_list_content.xml       | 69 ++++++++++++----------
 1 file changed, 39 insertions(+), 30 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index dd230806f..7179793b5 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -1,47 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
     <LinearLayout
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
         android:orientation="vertical"
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <!--<LinearLayout
+        <include layout="@layout/notify_area" />
+
+        <LinearLayout
+            android:id="@+id/content_frame"
+            android:layout_marginLeft="@dimen/drawer_content_padding"
             android:orientation="vertical"
-            android:background="@color/holo_gray_bright"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
-            <Spinner
-                android:id="@+id/key_list_filter_spinner"
+            <!--<LinearLayout
+                android:orientation="vertical"
+                android:background="@color/holo_gray_bright"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="12dp"
-                android:layout_marginRight="12dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp" />
-
-            <View
+                android:layout_height="wrap_content">
+
+                <Spinner
+                    android:id="@+id/key_list_filter_spinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginRight="12dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
+            </LinearLayout>-->
+
+            <fragment
+                android:id="@+id/key_list_fragment"
+                android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
                 android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider" />
-
-        </LinearLayout>-->
-
-        <fragment
-            android:id="@+id/key_list_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
+        </LinearLayout>
     </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
cgit v1.2.3