Merge branch 'master' of github.com:open-keychain/open-keychain

6 files changed, 2 insertions, 38 deletions

diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
index fb1aaa1e8..4b277c331 100644
--- a/OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml
+++ b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
@@ -13,6 +13,5 @@
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/decrypt_content_old" />
-
+    <include layout="@layout/encrypt_files_content" />
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml b/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml
deleted file mode 100644
index 15216af32..000000000
--- a/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-
-    <include layout="@layout/decrypt_content_old"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_content_old.xml b/OpenKeychain/src/main/res/layout/decrypt_content_old.xml
deleted file mode 100644
index f62cf615c..000000000
--- a/OpenKeychain/src/main/res/layout/decrypt_content_old.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
-    android:orientation="vertical">
-
-    <include layout="@layout/notify_area" />
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/decrypt_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v4.view.PagerTabStrip
-            android:id="@+id/decrypt_pager_tab_strip"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:textColor="@color/emphasis" />
-    </android.support.v4.view.ViewPager>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index 46daad28f..cdcf4fa43 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -7,7 +7,7 @@
         android:layout_height="match_parent"
         tools:context=".ui.EncryptFileActivity">
 
-    <include layout="@layout/encrypt_file_content"/>
+    <include layout="@layout/encrypt_files_content"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
index b44a2bc4d..b44a2bc4d 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index f4c479ee9..f4c479ee9 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml