From 9288e4f0a9e287c82dc4c4ba75bdf2043bbd5a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 28 Aug 2014 10:37:01 +0200
Subject: [PATCH] Fix RuntimeException in KeyListActivity on tablets

---
 .../layout-large/api_apps_list_activity.xml   | 22 +++++++++----------
 .../res/layout-large/decrypt_activity.xml     | 19 ++++++++--------
 .../res/layout-large/encrypt_activity.xml     | 16 ++++++--------
 .../res/layout-large/key_list_activity.xml    | 14 ++++++------
 .../src/main/res/layout/key_list_activity.xml | 11 +---------
 .../src/main/res/layout/key_list_content.xml  | 18 ++++++++++-----
 6 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
index 88686bbbc..af06614b9 100644
--- a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal" >
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
     <android.support.v4.widget.FixedDrawerLayout
-            android:id="@+id/drawer_layout"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-
-        <include layout="@layout/drawer_list"/>
+        <include layout="@layout/drawer_list" />
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/api_apps_list_content"/>
+    <include layout="@layout/api_apps_list_content" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
index 9e9f37391..06487a982 100644
--- a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v4.widget.FixedDrawerLayout
+        android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <android.support.v4.widget.FixedDrawerLayout
-            xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/drawer_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
 
-        <include layout="@layout/drawer_list"/>
+        <include layout="@layout/drawer_list" />
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/decrypt_content"/>
+    <include layout="@layout/decrypt_content" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
index 355580fad..84b2891e3 100644
--- a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <android.support.v4.widget.FixedDrawerLayout
-        xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-        xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/drawer_list"/>
+        <include layout="@layout/drawer_list" />
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/encrypt_content"/>
+    <include layout="@layout/encrypt_content" />
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
index 6abbea13f..039081cd7 100644
--- a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <android.support.v4.widget.FixedDrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/drawer_list"/>
+        <include layout="@layout/drawer_list" />
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/key_list_content"/>
+    <include layout="@layout/key_list_content" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml
index 297fc526e..03ef85381 100644
--- a/OpenKeychain/src/main/res/layout/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml
@@ -4,16 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/notify_area" />
-
-        <include layout="@layout/key_list_content" />
-
-    </LinearLayout>
+    <include layout="@layout/key_list_content" />
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index e58e42961..66b009c78 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/notify_area" />
+
+    <FrameLayout
         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/key_list_fragment"
             android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-</FrameLayout>
\ No newline at end of file
+            android:layout_height="match_parent" />
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file