From ce81123112a7e112365f7e17113f464558d40b83 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 31 Aug 2020 17:12:31 +0200 Subject: [PATCH] use content description in search fields --- src/main/java/eu/siacs/conversations/ui/SearchActivity.java | 1 + .../eu/siacs/conversations/ui/StartConversationActivity.java | 2 ++ src/main/res/menu/fragment_conversation.xml | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java index f1979828c..d73249f4b 100644 --- a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java @@ -121,6 +121,7 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc } searchField.addTextChangedListener(this); searchField.setHint(R.string.search_messages); + searchField.setContentDescription(getString(R.string.search_messages)); searchField.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE); if (term == null) { showKeyboard(searchField); diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 4d31d74d6..fa0d5ada9 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -621,8 +621,10 @@ public class StartConversationActivity extends XmppActivity implements XmppConne } if (binding.startConversationViewPager.getCurrentItem() == 0) { mSearchEditText.setHint(R.string.search_contacts); + mSearchEditText.setContentDescription(getString(R.string.search_contacts)); } else { mSearchEditText.setHint(R.string.search_bookmarks); + mSearchEditText.setContentDescription(getString(R.string.search_bookmarks)); } } diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml index 294807bea..9cad4d1bf 100644 --- a/src/main/res/menu/fragment_conversation.xml +++ b/src/main/res/menu/fragment_conversation.xml @@ -28,7 +28,7 @@ android:id="@+id/action_security" android:icon="?attr/icon_not_secure" android:orderInCategory="20" - android:title="@string/action_secure" + android:title="@string/encrypted_with_omemo" app:showAsAction="always">