From adea9df71411f7ea0ab08066c92048b0c2dad1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 22 Apr 2014 08:15:55 +0200
Subject: Workaround for nullpointer bug in support lib, close #591

---
 OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml | 4 ++--
 OpenKeychain/src/main/res/layout-large/decrypt_activity.xml       | 4 ++--
 OpenKeychain/src/main/res/layout-large/encrypt_activity.xml       | 4 ++--
 OpenKeychain/src/main/res/layout-large/key_list_activity.xml      | 4 ++--
 OpenKeychain/src/main/res/layout/api_apps_list_activity.xml       | 4 ++--
 OpenKeychain/src/main/res/layout/decrypt_activity.xml             | 4 ++--
 OpenKeychain/src/main/res/layout/encrypt_activity.xml             | 4 ++--
 OpenKeychain/src/main/res/layout/key_list_activity.xml            | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'OpenKeychain/src/main/res')

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 c0021261e..88686bbbc 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
@@ -4,7 +4,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal" >
-    <android.support.v4.widget.DrawerLayout
+    <android.support.v4.widget.FixedDrawerLayout
             android:id="@+id/drawer_layout"
 
             android:layout_width="match_parent"
@@ -13,7 +13,7 @@
 
         <include layout="@layout/drawer_list"/>
 
-    </android.support.v4.widget.DrawerLayout>
+    </android.support.v4.widget.FixedDrawerLayout>
 
     <include layout="@layout/api_apps_list_content"/>
 
diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
index 26aed0831..9e9f37391 100644
--- a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
@@ -4,7 +4,7 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <android.support.v4.widget.DrawerLayout
+    <android.support.v4.widget.FixedDrawerLayout
             xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
             android:id="@+id/drawer_layout"
             android:layout_width="match_parent"
@@ -12,7 +12,7 @@
 
         <include layout="@layout/drawer_list"/>
 
-    </android.support.v4.widget.DrawerLayout>
+    </android.support.v4.widget.FixedDrawerLayout>
 
     <include layout="@layout/decrypt_content"/>
 
diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
index 7d0d44074..355580fad 100644
--- a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
@@ -4,7 +4,7 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <android.support.v4.widget.DrawerLayout
+    <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"
@@ -13,7 +13,7 @@
 
         <include layout="@layout/drawer_list"/>
 
-    </android.support.v4.widget.DrawerLayout>
+    </android.support.v4.widget.FixedDrawerLayout>
 
     <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 6636f12ff..6abbea13f 100644
--- a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
@@ -4,14 +4,14 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <android.support.v4.widget.DrawerLayout
+    <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"/>
 
-    </android.support.v4.widget.DrawerLayout>
+    </android.support.v4.widget.FixedDrawerLayout>
 
     <include layout="@layout/key_list_content"/>
 
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
index 9f95e9f3b..df187e0a5 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -8,4 +8,4 @@
 
     <include layout="@layout/drawer_list" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
index c4709a67e..94d82fe1d 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
@@ -9,4 +9,4 @@
 
     <include layout="@layout/drawer_list" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_activity.xml
index 6484c9b7b..65c2ee8fd 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
@@ -10,4 +10,4 @@
 
     <include layout="@layout/drawer_list" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.FixedDrawerLayout>
\ 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 fcb376fa8..c4c2c35cb 100644
--- a/OpenKeychain/src/main/res/layout/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -8,4 +8,4 @@
 
     <include layout="@layout/drawer_list" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
-- 
cgit v1.2.3