aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-11-16 00:48:18 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2016-01-06 16:24:12 +0100
commit31cc083163c634ac1f11d7aa22c679cda24ce892 (patch)
tree15c19a7347fd2c86da3784b76c9bd0692d774e5b /OpenKeychain
parent840d57bf3b2c91f63f0df9d8988c16eb467b4a29 (diff)
downloadopen-keychain-31cc083163c634ac1f11d7aa22c679cda24ce892.tar.gz
open-keychain-31cc083163c634ac1f11d7aa22c679cda24ce892.tar.bz2
open-keychain-31cc083163c634ac1f11d7aa22c679cda24ce892.zip
passdialog: seconds field and some minor layout issues
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java2
-rw-r--r--OpenKeychain/src/main/res/layout/passphrase_dialog.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/simple_item.xml3
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java
index 9a8a2f1d1..11f6fafcd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java
@@ -73,7 +73,7 @@ public class CacheTTLSpinner extends AppCompatSpinner {
public long getSelectedTimeToLive() {
int selectedItemPosition = getSelectedItemPosition();
Object item = getAdapter().getItem(selectedItemPosition);
- return ((Cursor) item).getLong(0);
+ return ((Cursor) item).getLong(1);
}
}
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index fe09fb405..af05a3da4 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
- android:layout_margin="6dp">
+ android:layout_margin="8dp">
<TextView
android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/simple_item.xml b/OpenKeychain/src/main/res/layout/simple_item.xml
index 9a7bc58e3..45033a6e0 100644
--- a/OpenKeychain/src/main/res/layout/simple_item.xml
+++ b/OpenKeychain/src/main/res/layout/simple_item.xml
@@ -5,12 +5,13 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center">
+ android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/simple_item_text"
android:textAppearance="@android:style/TextAppearance.Medium"
+ android:padding="8dp"
tools:text="itemtext" />
</LinearLayout> \ No newline at end of file