jenkins-bot has submitted this change and it was merged.
Change subject: Fix clicking on History search results.
......................................................................
Fix clicking on History search results.
This was because the click handler for History items ignores the click if
an ActionMode is present (to account for the existing implementation of
the long-press-to-delete ActionMode). This is now fixed by setting a "tag"
on the search ActionMode, so that we can distinguish which ActionMode is
currently active.
Bug: T147854
Change-Id: Id55301a7bd4791a9a965fadf3b3ceee1486e48a2
---
M app/src/main/java/org/wikipedia/SearchActionModeCallback.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Niedzielski: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/SearchActionModeCallback.java
b/app/src/main/java/org/wikipedia/SearchActionModeCallback.java
index 616f44e..8caf379 100644
--- a/app/src/main/java/org/wikipedia/SearchActionModeCallback.java
+++ b/app/src/main/java/org/wikipedia/SearchActionModeCallback.java
@@ -9,10 +9,12 @@
import org.wikipedia.util.DeviceUtil;
public abstract class SearchActionModeCallback implements ActionMode.Callback {
+ public static final String ACTION_MODE_TAG = "searchActionMode";
private SearchView searchView;
@Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+ mode.setTag(ACTION_MODE_TAG);
mode.getMenuInflater().inflate(R.menu.menu_action_mode_search, menu);
searchView = (SearchView)
MenuItemCompat.getActionView(menu.findItem(R.id.menu_search_view));
searchView.setIconifiedByDefault(false);
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index eb5010f..3db61cf 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -228,7 +228,8 @@
private class HistoryItemClickListener implements
AdapterView.OnItemClickListener {
@Override
public void onItemClick(AdapterView<?> parent, View view, int
position, long id) {
- if (actionMode == null) {
+ if (actionMode == null
+ ||
SearchActionModeCallback.ACTION_MODE_TAG.equals(actionMode.getTag())) {
HistoryEntry oldEntry = (HistoryEntry) view.getTag();
HistoryEntry newEntry = new HistoryEntry(oldEntry.getTitle(),
HistoryEntry.SOURCE_HISTORY);
onPageClick(oldEntry.getTitle(), newEntry);
--
To view, visit https://gerrit.wikimedia.org/r/315275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id55301a7bd4791a9a965fadf3b3ceee1486e48a2
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
