aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-03-08 13:17:52 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2014-03-08 13:17:52 +0100
commit706e212b6b1f5fbd30643d33336f3967d88e8b5b (patch)
tree413c89cd597f30c8f6e4e59994617183440b6da9 /OpenPGP-Keychain/src/main/res
parent7ad8977cf3f4117782d6568322ec76c5cd8e2475 (diff)
downloadopen-keychain-706e212b6b1f5fbd30643d33336f3967d88e8b5b.tar.gz
open-keychain-706e212b6b1f5fbd30643d33336f3967d88e8b5b.tar.bz2
open-keychain-706e212b6b1f5fbd30643d33336f3967d88e8b5b.zip
add edit button and secret key info to public key view
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml32
-rw-r--r--OpenPGP-Keychain/src/main/res/values/strings.xml4
2 files changed, 35 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
index 055687183..fe09b5d7a 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
@@ -160,7 +160,10 @@
android:layout_height="wrap_content" />
</TableRow>
- <TableRow>
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:id="@+id/tableRow">
<TextView
android:layout_width="wrap_content"
@@ -175,6 +178,22 @@
android:layout_height="wrap_content"
android:typeface="monospace" />
</TableRow>
+
+ <TableRow>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip"
+ android:text="@string/label_secret_key" />
+
+ <TextView
+ android:id="@+id/secret_key"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:typeface="monospace" />
+ </TableRow>
</TableLayout>
<TextView
@@ -212,6 +231,17 @@
android:text="@string/section_actions" />
<com.beardedhen.androidbootstrap.BootstrapButton
+ android:id="@+id/action_edit"
+ android:layout_width="match_parent"
+ android:layout_height="60dp"
+ android:padding="4dp"
+ android:layout_marginBottom="10dp"
+ android:text="@string/key_view_action_edit"
+ bootstrapbutton:bb_icon_left="fa-lock"
+ bootstrapbutton:bb_type="info"
+ android:visibility="gone" />
+
+ <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_encrypt"
android:layout_width="match_parent"
android:layout_height="60dp"
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 7f0ad52ac..4a5b142ab 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -417,6 +417,7 @@
<string name="key_list_empty_button_import">importing keys.</string>
<!-- Key view -->
+ <string name="key_view_action_edit">Edit this key</string>
<string name="key_view_action_encrypt">Encrypt to this contact</string>
<string name="key_view_action_certify">Certify this contact\'s key</string>
<string name="key_view_tab_main">Info</string>
@@ -433,5 +434,8 @@
<string name="drawer_close">Close navigation drawer</string>
<string name="edit">Edit</string>
<string name="my_keys">My Keys</string>
+ <string name="label_secret_key">Secret Key</string>
+ <string name="secret_key_yes">available</string>
+ <string name="secret_key_no">unavailable</string>
</resources>