diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
| commit | b4aec3114d9911cf9aef0d14ee697e5131b2853f (patch) | |
| tree | 7237de5955ec34d8849737b2f9229bfbb37d0c45 /OpenKeychain/src/main/res/layout/encrypt_files_activity.xml | |
| parent | c2163460971cc01e65d7dfd18eec491f01ebc744 (diff) | |
| parent | baac30508d24dcda6135bf8ae338c99d8c3b8ad8 (diff) | |
| download | open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.gz open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.bz2 open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.zip | |
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/encrypt_files_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_files_activity.xml | 10 |
1 files changed, 4 insertions, 6 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" /> |