diff options
| author | Vincent <valodim@mugenguild.com> | 2014-08-17 15:46:27 +0200 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2014-08-17 15:46:27 +0200 |
| commit | 56fb82203429566d2bbb41473fd64e93af4afb73 (patch) | |
| tree | 3b286d18919f246d2c518f55e664ea516b742804 /OpenKeychain/src/main/res | |
| parent | 14290c3ce9a1cfcf2b45c47198ba44737bd5d996 (diff) | |
| parent | 57b2440731ebed567c59ae16c1f669fb47d0544f (diff) | |
| download | open-keychain-56fb82203429566d2bbb41473fd64e93af4afb73.tar.gz open-keychain-56fb82203429566d2bbb41473fd64e93af4afb73.tar.bz2 open-keychain-56fb82203429566d2bbb41473fd64e93af4afb73.zip | |
Merge pull request #772 from mar-v-in/issue-729
Remove NoSwipeWrapContentViewPager
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_content.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml index e5edc6657..d029e7b83 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml @@ -9,13 +9,11 @@ <include layout="@layout/notify_area"/> - <org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager + <FrameLayout android:id="@+id/encrypt_pager_mode" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - </org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager> + android:layout_height="wrap_content" + android:orientation="vertical" /> <android.support.v4.view.ViewPager android:id="@+id/encrypt_pager_content" |