From 51ea71d68ac58795abdc6f265ba8ed27a87ef05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 29 Sep 2014 22:23:48 +0200
Subject: Maybe fixes encrypt files on tablets

---
 .../src/main/res/layout/encrypt_file_activity.xml  | 14 -----
 .../src/main/res/layout/encrypt_file_content.xml   | 23 -------
 .../src/main/res/layout/encrypt_file_fragment.xml  | 72 ----------------------
 .../src/main/res/layout/encrypt_files_activity.xml | 14 +++++
 .../src/main/res/layout/encrypt_files_content.xml  | 23 +++++++
 .../src/main/res/layout/encrypt_files_fragment.xml | 72 ++++++++++++++++++++++
 6 files changed, 109 insertions(+), 109 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_file_content.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_files_content.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
deleted file mode 100644
index 46daad28f..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.EncryptFileActivity">
-
-    <include layout="@layout/encrypt_file_content"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
deleted file mode 100644
index b44a2bc4d..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
+++ /dev/null
@@ -1,23 +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" />
-
-    <FrameLayout
-        android:id="@+id/encrypt_pager_mode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-
-    <fragment
-        android:id="@+id/encrypt_file_fragment"
-        android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
deleted file mode 100644
index f4c479ee9..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical">
-
-        <ListView
-            android:id="@+id/selected_files_list"
-            android:dividerHeight="4dip"
-            android:divider="@android:color/transparent"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:layout_marginTop="8dp"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <!-- Note: The following construct should be a widget, we use it quiet often -->
-
-        <LinearLayout
-            android:id="@+id/action_encrypt_share"
-            android:paddingLeft="8dp"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/btn_encrypt_share_file"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/action_encrypt_file"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_save"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
new file mode 100644
index 000000000..cdcf4fa43
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.FixedDrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.EncryptFileActivity">
+
+    <include layout="@layout/encrypt_files_content"/>
+
+    <include layout="@layout/drawer_list" />
+
+</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
new file mode 100644
index 000000000..b44a2bc4d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
@@ -0,0 +1,23 @@
+<?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" />
+
+    <FrameLayout
+        android:id="@+id/encrypt_pager_mode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <fragment
+        android:id="@+id/encrypt_file_fragment"
+        android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
new file mode 100644
index 000000000..f4c479ee9
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical">
+
+        <ListView
+            android:id="@+id/selected_files_list"
+            android:dividerHeight="4dip"
+            android:divider="@android:color/transparent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:layout_marginTop="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <!-- Note: The following construct should be a widget, we use it quiet often -->
+
+        <LinearLayout
+            android:id="@+id/action_encrypt_share"
+            android:paddingLeft="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/btn_encrypt_share_file"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/action_encrypt_file"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_save"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3