diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 92 |
1 files changed, 53 insertions, 39 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 451eb30ee..a2d104694 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -1,52 +1,66 @@ <?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" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> - <include layout="@layout/notify_area" /> + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> <LinearLayout - android:id="@+id/view_key_status_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/view_key_status_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_below="@id/toolbar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include layout="@layout/notify_area" /> - <TextView - android:id="@+id/view_key_status_text" + <LinearLayout + android:id="@+id/view_key_status_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" /> + android:layout_gravity="center" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:orientation="horizontal"> - </LinearLayout> + <ImageView + android:id="@+id/view_key_status_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:visibility="gone" - android:id="@+id/view_key_status_divider" /> + <TextView + android:id="@+id/view_key_status_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_gravity="center_vertical" + android:layout_marginLeft="8dp" /> - <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout - android:id="@+id/view_key_sliding_tab_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + </LinearLayout> - <android.support.v4.view.ViewPager - android:id="@+id/view_key_pager" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="1" - android:background="@android:color/white" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:visibility="gone" + android:id="@+id/view_key_status_divider" /> + + <com.astuetz.PagerSlidingTabStrip + android:id="@+id/view_key_sliding_tab_layout" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:textColor="#FFFFFF" + app:pstsIndicatorColor="#FFFFFF" /> -</LinearLayout>
\ No newline at end of file + <android.support.v4.view.ViewPager + android:id="@+id/view_key_pager" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1" + android:background="@android:color/white" /> + + </LinearLayout> +</RelativeLayout>
\ No newline at end of file |