diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:20:43 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:20:43 +0200 |
| commit | 36d8c9f608cca5ba2f8df11008415c230825174b (patch) | |
| tree | ebb2f9d5f4c119668b4e5e08feb4db8a03b9caed /OpenKeychain/src/main/res/layout | |
| parent | eae7c711a3f588a24ef621a8b82bcd793bcb7e70 (diff) | |
| download | open-keychain-36d8c9f608cca5ba2f8df11008415c230825174b.tar.gz open-keychain-36d8c9f608cca5ba2f8df11008415c230825174b.tar.bz2 open-keychain-36d8c9f608cca5ba2f8df11008415c230825174b.zip | |
Fix merge
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_content.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml index b2bdbf7b5..e5edc6657 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml @@ -7,6 +7,8 @@ android:layout_height="match_parent" android:orientation="vertical"> + <include layout="@layout/notify_area"/> + <org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager android:id="@+id/encrypt_pager_mode" android:layout_width="match_parent" |