diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-13 21:01:47 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-13 21:01:47 +0200 |
| commit | 3bc3bc6d5878d19d7dbf7dc452d5650eb6e3c212 (patch) | |
| tree | 26120985d76327dfc9dfc546ac3a5640cfaa5908 /OpenKeychain/src/main | |
| parent | be4882f5c117e8c1fa64ac77970571c680652700 (diff) | |
| download | open-keychain-3bc3bc6d5878d19d7dbf7dc452d5650eb6e3c212.tar.gz open-keychain-3bc3bc6d5878d19d7dbf7dc452d5650eb6e3c212.tar.bz2 open-keychain-3bc3bc6d5878d19d7dbf7dc452d5650eb6e3c212.zip | |
More smaller UI fixes
Diffstat (limited to 'OpenKeychain/src/main')
3 files changed, 7 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java index de4d7fa42..f48006f08 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java @@ -59,6 +59,7 @@ public class ViewKeyMainFragment extends LoaderFragment implements private View mActionEditDivider; private View mActionEncryptFiles; private View mActionEncryptText; + private View mActionEncryptTextText; private View mActionCertify; private View mActionCertifyText; private ImageView mActionCertifyImage; @@ -85,6 +86,7 @@ public class ViewKeyMainFragment extends LoaderFragment implements mActionEdit = view.findViewById(R.id.view_key_action_edit); mActionEditDivider = view.findViewById(R.id.view_key_action_edit_divider); mActionEncryptText = view.findViewById(R.id.view_key_action_encrypt_text); + mActionEncryptTextText = view.findViewById(R.id.view_key_action_encrypt_text_text); mActionEncryptFiles = view.findViewById(R.id.view_key_action_encrypt_files); mActionCertify = view.findViewById(R.id.view_key_action_certify); mActionCertifyText = view.findViewById(R.id.view_key_action_certify_text); @@ -236,6 +238,7 @@ public class ViewKeyMainFragment extends LoaderFragment implements mActionCertify.setEnabled(false); mActionCertifyText.setEnabled(false); mActionEncryptText.setEnabled(false); + mActionEncryptTextText.setEnabled(false); mActionEncryptFiles.setEnabled(false); } else { mActionEdit.setEnabled(true); @@ -245,11 +248,13 @@ public class ViewKeyMainFragment extends LoaderFragment implements mActionCertify.setEnabled(false); mActionCertifyText.setEnabled(false); mActionEncryptText.setEnabled(false); + mActionEncryptTextText.setEnabled(false); mActionEncryptFiles.setEnabled(false); } else { mActionCertify.setEnabled(true); mActionCertifyText.setEnabled(true); mActionEncryptText.setEnabled(true); + mActionEncryptTextText.setEnabled(true); mActionEncryptFiles.setEnabled(true); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index 561d37cfc..38ba675e9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -163,6 +163,7 @@ public class SubkeysAdapter extends CursorAdapter { context.getString(R.string.key_stripped) ); boldStripped.setSpan(new StyleSpan(Typeface.BOLD), 0, boldStripped.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + algorithmStr.append(boldStripped); } else { switch (SecretKeyType.fromNum(cursor.getInt(INDEX_HAS_SECRET))) { case GNU_DUMMY: diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 918e50dc4..6bcb216d7 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -103,6 +103,7 @@ android:orientation="horizontal"> <TextView + android:id="@+id/view_key_action_encrypt_text_text" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" |