Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
52 lines
1.8 KiB
XML
52 lines
1.8 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<include layout="@layout/notify_area"/>
|
|
|
|
<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:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/view_key_status_image" />
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/view_key_status_text"
|
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
android:layout_gravity="center_vertical"
|
|
android:layout_marginLeft="8dp"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<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" />
|
|
|
|
<org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
|
|
android:id="@+id/view_key_sliding_tab_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" />
|
|
|
|
<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> |