aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/help_activity.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-13 23:15:13 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-13 23:15:13 +0100
commitd8ff737fc5392362707ad70fbe964ac9e299457f (patch)
tree7af64313395f2d13f2e7129a573d4ef7333fadef /OpenKeychain/src/main/res/layout/help_activity.xml
parent862d1f1971a16d639dec47bd60226a959efe76b0 (diff)
downloadopen-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.gz
open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.bz2
open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.zip
Use Toolbar and new BaseActivity
Diffstat (limited to 'OpenKeychain/src/main/res/layout/help_activity.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/help_activity.xml33
1 files changed, 22 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 3ad087da3..794964adb 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -1,17 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
+ android:layout_height="match_parent">
- <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
- android:id="@+id/sliding_tab_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/toolbar" />
+
+ <LinearLayout
+ android:layout_below="@id/toolbar"
- <android.support.v4.view.ViewPager
- android:id="@+id/pager"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <org.sufficientlysecure.keychain.ui.widget.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"
+ android:layout_height="match_parent" />
-</LinearLayout> \ No newline at end of file
+ </LinearLayout>
+</RelativeLayout> \ No newline at end of file