diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-07 09:05:38 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-07 09:05:38 +0200 |
commit | a36f7f80e2552aff0b7bd647e8f9aec0cc80efec (patch) | |
tree | e1466d03c79babf87f7d2baf4b381448b7f72c6d /OpenKeychain/src/main/res/layout/help_activity.xml | |
parent | dc382a2ddd40a2797ad3458a50afb5e88ec27b32 (diff) | |
parent | 174858e9cf8f874fec3a564d026a79be7d166cff (diff) | |
download | open-keychain-a36f7f80e2552aff0b7bd647e8f9aec0cc80efec.tar.gz open-keychain-a36f7f80e2552aff0b7bd647e8f9aec0cc80efec.tar.bz2 open-keychain-a36f7f80e2552aff0b7bd647e8f9aec0cc80efec.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/layout/help_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/help_activity.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 58e4919dc..76ba183b7 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -4,6 +4,11 @@ android:layout_height="match_parent" android:orientation="vertical" > + <org.sufficientlysecure.keychain.util.SlidingTabLayout + android:id="@+id/sliding_tab_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <android.support.v4.view.ViewPager android:id="@+id/pager" android:layout_width="match_parent" |