diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
| commit | c0ebc926117d3e444c7c32bf3251880852000df6 (patch) | |
| tree | b84926b3eee5cf1cfd6d38a2c3bec23e8f0b6779 /OpenKeychain/src/main/res/layout/encrypt_content.xml | |
| parent | ad69e47cec58287d82978b28416db50f6c3feb77 (diff) | |
| parent | b193965e585d0d492cf2744e3c86ecc9e45b71d4 (diff) | |
| download | open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.gz open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.bz2 open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.zip | |
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/encrypt_content.xml')
| -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" |