diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_activity.xml | 41 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml (renamed from OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml) | 36 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml (renamed from OpenKeychain/src/main/res/layout/view_key_share_fragment.xml) | 0 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml | 34 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml | 32 |
5 files changed, 78 insertions, 65 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml b/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml new file mode 100644 index 000000000..59888c25a --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml @@ -0,0 +1,41 @@ +<?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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar_include" + layout="@layout/toolbar_standalone" /> + + <LinearLayout + android:layout_below="@id/toolbar_include" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <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="@color/tab_text" + app:pstsTextColorSelected="@color/tab_text_selected" + app:pstsIndicatorColor="@color/tab_indicator" /> + + <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 diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml index 9a2190f7e..2232ea9f2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml @@ -1,6 +1,4 @@ -<!--<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:layout_width="match_parent"--><!--android:layout_height="match_parent">--> - -<!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> +<?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" @@ -13,31 +11,6 @@ style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="8dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:text="@string/section_keys" /> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.4"> - - <ListView - android:id="@+id/keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:layout_marginBottom="8dp" /> - </FrameLayout> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" @@ -60,8 +33,7 @@ <FrameLayout android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.6"> + android:layout_height="match_parent"> <se.emilsjolander.stickylistheaders.StickyListHeadersListView android:layout_width="match_parent" @@ -82,6 +54,4 @@ </FrameLayout> -</LinearLayout> - - <!--</ScrollView>--> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index 9971032ce..9971032ce 100644 --- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml new file mode 100644 index 000000000..62fd113f9 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml @@ -0,0 +1,34 @@ +<?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:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" + android:orientation="vertical"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="8dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:text="@string/section_keys" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ListView + android:id="@+id/keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbarStyle="outsideOverlay" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:layout_marginBottom="8dp" /> + </FrameLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml deleted file mode 100644 index c7f0f50d9..000000000 --- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include - android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> - - <LinearLayout - android:layout_below="@id/toolbar_include" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/notify_area" /> - - <FrameLayout - android:id="@+id/content_frame" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:id="@+id/view_key_advanced_fragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> - - </FrameLayout> - - </LinearLayout> -</RelativeLayout>
\ No newline at end of file |