diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 00:57:23 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 00:57:23 +0100 |
| commit | 4db86fdabe80cffba13b5e18e1576b5d8de39e8d (patch) | |
| tree | 80ca70fdd019824c65fc3b73740b1311cecc257e /OpenKeychain/src/main/res/layout/help_activity.xml | |
| parent | f76f84dfb2e406dd613be04dabd9432ffd0f9c4b (diff) | |
| parent | e3547b497932a1c0219c11d586858754c82d19da (diff) | |
| download | open-keychain-4db86fdabe80cffba13b5e18e1576b5d8de39e8d.tar.gz open-keychain-4db86fdabe80cffba13b5e18e1576b5d8de39e8d.tar.bz2 open-keychain-4db86fdabe80cffba13b5e18e1576b5d8de39e8d.zip | |
Merge remote-tracking branch 'development' into linked-identities
Diffstat (limited to 'OpenKeychain/src/main/res/layout/help_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/help_activity.xml | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 1722f03ea..0b309a8b1 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -1,33 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical"> <include - android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> + android:id="@+id/toolbar_tabs" + layout="@layout/toolbar_tabs" /> - <LinearLayout - android:layout_below="@id/toolbar_include" + <android.support.v4.view.ViewPager + android:id="@+id/pager" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:elevation="4dp"> + android:layout_height="match_parent" /> - <com.astuetz.PagerSlidingTabStrip - android:id="@+id/sliding_tab_layout" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - android:textColor="@color/tab_text" - app:pstsTextColorSelected="@color/tab_text_selected" - app:pstsIndicatorColor="@color/tab_indicator" /> - - <android.support.v4.view.ViewPager - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file |