diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-07 02:14:47 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-07 02:14:47 +0200 |
commit | 6aafb314125f016e2215f7d33baf600b5768d72c (patch) | |
tree | 274384e6d4c6cd9e86e5e9ae9b89c835aaa30361 /OpenKeychain/src/main/res/layout | |
parent | 96125b1976b1cddec946d1ef8e28c4868a63e354 (diff) | |
download | open-keychain-6aafb314125f016e2215f7d33baf600b5768d72c.tar.gz open-keychain-6aafb314125f016e2215f7d33baf600b5768d72c.tar.bz2 open-keychain-6aafb314125f016e2215f7d33baf600b5768d72c.zip |
ui: move revocation/expiry notes above tab slider
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 29 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_main_fragment.xml | 22 |
2 files changed, 29 insertions, 22 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index eed71945b..aa6089aa2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -4,6 +4,35 @@ android:layout_height="match_parent" android:orientation="vertical"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This key is expired!" + android:id="@+id/view_key_expired" + android:textColor="@color/alert" + android:textAppearance="?android:attr/textAppearanceSmall" + android:gravity="center_vertical|center_horizontal" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:visibility="gone" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This key has been revoked!" + android:id="@+id/view_key_revoked" + android:textColor="@color/alert" + android:textAppearance="?android:attr/textAppearanceSmall" + android:gravity="center_vertical|center_horizontal" + android:visibility="gone" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + <org.sufficientlysecure.keychain.util.SlidingTabLayout android:id="@+id/view_key_sliding_tab_layout" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 7d0f714a0..1cd0f0214 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -17,28 +17,6 @@ android:visibility="visible"> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="This key is expired!" - android:id="@+id/view_key_expired" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textColor="@color/alert" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_vertical|center_horizontal" - android:visibility="gone" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="This key has been revoked!" - android:id="@+id/view_key_revoked" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textColor="@color/alert" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_vertical|center_horizontal" - android:visibility="gone" /> - - <TextView style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="0dp" |