diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml (renamed from OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml) | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_files_activity.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_file_activity.xml) | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_files_content.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_file_content.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml) | 0 |
4 files changed, 2 insertions, 3 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/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 |