diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-31 00:24:08 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-31 00:24:08 +0200 |
| commit | aea52f2e6f5463b0a957a36a14604d56b342069c (patch) | |
| tree | 2ade60df1e8a441bf6b72d689113e6256b2bc8b3 /OpenKeychain | |
| parent | 6cc7b6141a42870840a290455e16d7e599fa3469 (diff) | |
| download | open-keychain-aea52f2e6f5463b0a957a36a14604d56b342069c.tar.gz open-keychain-aea52f2e6f5463b0a957a36a14604d56b342069c.tar.bz2 open-keychain-aea52f2e6f5463b0a957a36a14604d56b342069c.zip | |
Simplify passphrase dialog design
Diffstat (limited to 'OpenKeychain')
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index c1771ce57..c75e188a8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -191,7 +191,8 @@ public class PassphraseDialogActivity extends FragmentActivity { CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(theme); - alert.setTitle(R.string.title_unlock); + // No title, see http://www.google.com/design/spec/components/dialogs.html#dialogs-alerts + //alert.setTitle() LayoutInflater inflater = LayoutInflater.from(theme); View view = inflater.inflate(R.layout.passphrase_dialog, null); @@ -319,7 +320,7 @@ public class PassphraseDialogActivity extends FragmentActivity { AlertDialog dialog = alert.create(); dialog.setButton(DialogInterface.BUTTON_POSITIVE, - activity.getString(android.R.string.ok), (DialogInterface.OnClickListener) null); + activity.getString(R.string.btn_unlock), (DialogInterface.OnClickListener) null); return dialog; } diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml index d2e85633f..a2e6af27c 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml @@ -26,7 +26,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" android:imeOptions="actionDone" android:hint="@string/label_passphrase" android:ems="10" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 6d29ce3fd..8d148c8fe 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -12,7 +12,6 @@ <string name="title_encrypt_text">"Encrypt"</string> <string name="title_encrypt_files">"Encrypt"</string> <string name="title_decrypt">"Decrypt"</string> - <string name="title_unlock">"Unlock Key"</string> <string name="title_add_subkey">"Add subkey"</string> <string name="title_edit_key">"Edit Key"</string> <string name="title_preferences">"Settings"</string> @@ -86,6 +85,7 @@ <string name="btn_encrypt_files">"Encrypt files"</string> <string name="btn_encrypt_text">"Encrypt text"</string> <string name="btn_add_email">"Add additional email address"</string> + <string name="btn_unlock">"Unlock"</string> <!-- menu --> <string name="menu_preferences">"Settings"</string> |