aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2016-01-11 13:33:22 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2016-01-11 13:33:22 +0100
commitb939b04af174a4133dfcec77dbd0aea147a9c778 (patch)
treedb1c228afe540af550c633e7cb8f5c588560a1f5 /OpenKeychain/src/main/res
parent03b9ddf9f9cd87583b1894c12c1826bd4b96b6ab (diff)
downloadopen-keychain-b939b04af174a4133dfcec77dbd0aea147a9c778.tar.gz
open-keychain-b939b04af174a4133dfcec77dbd0aea147a9c778.tar.bz2
open-keychain-b939b04af174a4133dfcec77dbd0aea147a9c778.zip
keycreate: add button to revert to default key configuration
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_final_fragment.xml43
1 files changed, 42 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 578e036d8..e1a4037fe 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
<ScrollView
android:layout_width="match_parent"
@@ -75,6 +76,46 @@
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:id="@+id/custom_key_layout"
+ android:visibility="gone"
+ tools:visibility="visible"
+ >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp">
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="Using a custom key configuration!" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="Revert"
+ android:id="@+id/revert_key_configuration" />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider" />
+
+ </LinearLayout>
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"