aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/view_key_activity.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-28 15:18:11 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-28 15:18:11 +0200
commit765ec094c9415fcaddd65b7b743179b2ea7dc098 (patch)
tree007e80c26488111f7c8ece1b8afb4b9447dd9022 /OpenKeychain/src/main/res/layout/view_key_activity.xml
parent905148f5869ed40daf18fd95f60c754287272b69 (diff)
downloadopen-keychain-765ec094c9415fcaddd65b7b743179b2ea7dc098.tar.gz
open-keychain-765ec094c9415fcaddd65b7b743179b2ea7dc098.tar.bz2
open-keychain-765ec094c9415fcaddd65b7b743179b2ea7dc098.zip
Make keybase an experimental feature
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_activity.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml22
1 files changed, 18 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 1c29ad759..3913122bc 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -182,18 +182,32 @@
android:layout_gravity="fill_vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
- <FrameLayout
+ <LinearLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<FrameLayout
android:id="@+id/view_key_fragment"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content" />
+
+ <FrameLayout
+ android:id="@+id/view_key_keybase_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <!--
+ placeholder to improve the scrolling.
+ Somehow the content must be large enough to enable scrolling on NestedScrollView
+ -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="230dp"
android:orientation="vertical" />
- </FrameLayout>
+ </LinearLayout>
</android.support.v4.widget.FlingNestedScrollView>