tdf#96790 search function in non experimental mode

The patch was sent for the ULAKBIM/Pardus project.
Signed-off-by: Mert Tümer <merttumer7@gmail.com>

Change-Id: I4e2ecc25eee6535b7d8a89800aaa8135cf517889
Reviewed-on: https://gerrit.libreoffice.org/47568Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

android/source/res/menu/main.xml

@@ -31,17 +31,19 @@
             android:orderInCategory="100"
             app:showAsAction="always"/>
 
-        <item android:id="@+id/action_search"
-              android:title="@string/action_search"
-              android:icon="@drawable/ic_search"
-              android:orderInCategory="100"
-              app:showAsAction="always"/>
 
         <item android:id="@+id/action_save"
             android:title="@string/action_save"
             android:orderInCategory="100" />
     </group>
 
+
+    <item android:id="@+id/action_search"
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search"
+        android:orderInCategory="100"
+        app:showAsAction="always"/>
+
     <item android:id="@+id/action_presentation"
         android:title="@string/action_presentation"
         android:orderInCategory="100"

android/source/src/java/org/libreoffice/InvalidationHandler.java

@@ -49,8 +49,13 @@ public class InvalidationHandler implements Document.MessageCallback, Office.Mes
     @Override
     public void messageRetrieved(int messageID, String payload) {
         if (!LOKitShell.isEditingEnabled()) {
-            // enable handling of hyperlinks even in the Viewer
-            if (messageID != Document.CALLBACK_INVALIDATE_TILES && messageID != Document.CALLBACK_HYPERLINK_CLICKED)
+            // enable handling of hyperlinks and search result even in the Viewer
+            if (messageID != Document.CALLBACK_INVALIDATE_TILES
+                    && messageID != Document.CALLBACK_HYPERLINK_CLICKED
+                    && messageID != Document.CALLBACK_SEARCH_RESULT_SELECTION
+                    && messageID != Document.CALLBACK_TEXT_SELECTION
+                    && messageID != Document.CALLBACK_TEXT_SELECTION_START
+                    && messageID != Document.CALLBACK_TEXT_SELECTION_END)
                 return;
         }
         switch (messageID) {