aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_activity.xml10
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml6
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_text_activity.xml2
3 files changed, 8 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index ce8b1302c..435ea96df 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -23,14 +23,12 @@
<include layout="@layout/notify_area" />
<FrameLayout
- android:id="@+id/encrypt_pager_mode"
+ android:id="@+id/encrypt_mode_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" />
+ android:layout_height="wrap_content" />
- <fragment
- android:id="@+id/encrypt_file_fragment"
- android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
+ <FrameLayout
+ android:id="@+id/encrypt_file_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index 029e735b3..5831d52e1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
+ android:layout_height="match_parent"
android:orientation="vertical">
<ListView
@@ -12,6 +10,8 @@
android:divider="@android:color/transparent"
android:focusable="true"
android:focusableInTouchMode="true"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
android:layout_marginTop="8dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 809e64f02..dcf5bd041 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -23,7 +23,7 @@
<include layout="@layout/notify_area" />
<FrameLayout
- android:id="@+id/encrypt_pager_mode"
+ android:id="@+id/encrypt_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />