aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-05 15:07:11 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-05 15:07:11 +0200
commit369f6e080c110a0446aad793886e60924afe510e (patch)
tree6c8b98a2acb730e39f6dd0cf716fec8b35949c69 /OpenKeychain/src/main/res
parente9fccff8bce3648f8e9e6677d712723a98c0fd1a (diff)
downloadopen-keychain-369f6e080c110a0446aad793886e60924afe510e.tar.gz
open-keychain-369f6e080c110a0446aad793886e60924afe510e.tar.bz2
open-keychain-369f6e080c110a0446aad793886e60924afe510e.zip
Refactor expiry dialog
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/expiry_dialog.xml16
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 17 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/expiry_dialog.xml b/OpenKeychain/src/main/res/layout/expiry_dialog.xml
new file mode 100644
index 000000000..14fff0b3f
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/expiry_dialog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/datePicker"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:spinnersShown="true"
+ android:calendarViewShown="false" />
+ <!-- Hide calendarView in tablets because of the unix warparound bug. -->
+
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index ed5dca813..18031e25b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -51,7 +51,7 @@
<string name="btn_save">Save</string>
<string name="btn_do_not_save">Cancel</string>
<string name="btn_delete">Delete</string>
- <string name="btn_no_date">None</string>
+ <string name="btn_no_date">No Expiry</string>
<string name="btn_okay">Okay</string>
<string name="btn_export_to_server">Upload To Keyserver</string>
<string name="btn_next">Next</string>