Merge remote-tracking branch 'remotes/upstream/master'

# Conflicts:
#	android/res/values/strings.xml

res/values/strings.xml

@@ -57,12 +57,15 @@
   <string name="menu_bookmarks_list">Bookmarks</string>
   <string name="no_section_info">No Content Headers Found</string>
   <string name="request_storage">To access zim files we need access to your storage</string>
+  <string name="clear_recent_history_dialog">Are you sure you want to delete your search history?</string>
   <string name="clear_recent_and_tabs_history_dialog">Are you sure you want to delete your search history and reset all active tabs?</string>
   <string name="deleteRecentSearchItem">Delete this item?</string>
   <string name="pref_clear_all_history_title">Clear History</string>
   <string name="pref_clear_all_history_summary">Clears recent searches,tabs history</string>
   <string name="pref_clear_recent_searches_title">Clear recent searches</string>
   <string name="all_history_cleared_toast">All History Cleared</string>
+  <string name="recent_search_removed_toast">Recent searches cleared</string>
+  <string name="recent_search_dialog_title">Clear History</string>
   <string name="clear_all_history_dialog_title">Clear All History</string>
   <string name="delete">Delete</string>
   <string name="delete_specific_search_toast">Recent search removed</string>

src/org/kiwix/kiwixmobile/KiwixMobileActivity.java

@@ -144,43 +144,80 @@ public class KiwixMobileActivity extends AppCompatActivity {
   public static ArrayList<State> mPrefState;
 
   public static boolean mIsFullscreenOpened;
+
   public static TextView headerView;
+
   private static String jsContent;
+
   public Menu menu;
+
   public Toolbar toolbar;
+
   public boolean isFullscreenOpened;
+
   public ImageButton exitFullscreenButton;
+
   public List<SectionProperties> sectionProperties;
+
   public DrawerLayout mRightDrawerLayout;
+
   public Handler mHandler = new Handler();
+
   protected boolean requestClearHistoryAfterLoad;
+
   protected boolean requestInitAllMenuItems;
+
   protected int requestWebReloadOnFinished;
+
   private HTMLUtils htmlUtils;
+
   private boolean mIsBacktotopEnabled;
+
   private boolean mIsSpeaking;
+
   private Button mBackToTopButton;
+
   private ListView mLeftDrawerList;
+
   private ListView mRightDrawerList;
+
   private DrawerLayout mLeftDrawerLayout;
+
   private ArrayList<String> bookmarks;
+
   private List<KiwixWebView> mWebViews = new ArrayList<>();
+
   private List<TextView> mSections = new ArrayList<>();
+
   private KiwixTextToSpeech tts;
+
   private CompatFindActionModeCallback mCompatCallback;
+
   private ArrayAdapter<KiwixWebView> mLeftArrayAdapter;
+
   private ArrayAdapter<TextView> mRightArrayAdapter;
+
   private FrameLayout mContentFrame;
+
   private RelativeLayout mToolbarContainer;
+
   private int mCurrentWebViewIndex = 0;
+
   private AnimatedProgressBar mProgressBar;
+
   private File mFile;
+
   // Initialized when onActionModeStarted is triggered.
   private ActionMode mActionMode = null;
+
   private KiwixWebView tempForUndo;
+
   private LinearLayout snackbarLayout;
+
   private RateAppCounter visitCounterPref;
+
   private int tempVisitCount;
+
   private int prevSize; // size before removed (undo snackbar)
 
   @Override