From 85d963047e2751820be9226088da46cabd32a6e7 Mon Sep 17 00:00:00 2001
From: Jonathan Fung <jonathanfung@users.noreply.github.com>
Date: Sat, 30 Jun 2018 10:49:44 +0100
Subject: [PATCH] Adding a long press icon description for the Search icon

Fixes #7836
---
 res/values/strings.xml                                       | 1 +
 src/org/thoughtcrime/securesms/ConversationListActivity.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebf1e6a241..c73b9a55f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -669,6 +669,7 @@
 
     <!-- SearchToolbar -->
     <string name="SearchToolbar_search">Search</string>
+    <string name="SearchToolbar_search_for_conversations_contacts_and_messages">Search for conversations, contacts, and messages</string>
 
     <!-- SingleRecipientNotificationBuilder -->
     <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 53eb4c2f7d..1787a5b447 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -25,6 +25,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
+import android.support.v7.widget.TooltipCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -87,6 +88,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
     RatingManager.showRatingDialogIfNecessary(this);
     RegistrationLockDialog.showReminderIfNecessary(this);
+
+    TooltipCompat.setTooltipText(searchAction, getText(R.string.SearchToolbar_search_for_conversations_contacts_and_messages));
   }
 
   @Override