[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Pastes text on search bar correctly

2017-10-23 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/384192 )

Change subject: Fix: Pastes text on search bar correctly
..


Fix: Pastes text on search bar correctly

Simply adds !isSearching() on onActionModeStarted to sovle this issue.

Bug: T177904
Change-Id: I8bab94ff404947870b774e7f982af7612030b28e
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified
  Zoranzoki21: Looks good to me, but someone else must approve



diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index ad6fa6b..8a0427a 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -808,7 +808,7 @@
 @Override
 public void onActionModeStarted(ActionMode mode) {
 super.onActionModeStarted(mode);
-if (!isCabOpen() && mode.getTag() == null) {
+if (!isSearching() && !isCabOpen() && mode.getTag() == null) {
 Menu menu = mode.getMenu();
 menu.clear();
 mode.getMenuInflater().inflate(R.menu.menu_text_select, menu);

-- 
To view, visit https://gerrit.wikimedia.org/r/384192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bab94ff404947870b774e7f982af7612030b28e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Pastes text on search bar correctly

2017-10-13 Thread Cooltey (Code Review)
Cooltey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384192 )

Change subject: Fix: Pastes text on search bar correctly
..

Fix: Pastes text on search bar correctly

Simply adds !isSearching() on onActionModeStarted to sovle this issue.

Bug: T177904
Change-Id: I8bab94ff404947870b774e7f982af7612030b28e
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/92/384192/1

diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index ad6fa6b..8a0427a 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -808,7 +808,7 @@
 @Override
 public void onActionModeStarted(ActionMode mode) {
 super.onActionModeStarted(mode);
-if (!isCabOpen() && mode.getTag() == null) {
+if (!isSearching() && !isCabOpen() && mode.getTag() == null) {
 Menu menu = mode.getMenu();
 menu.clear();
 mode.getMenuInflater().inflate(R.menu.menu_text_select, menu);

-- 
To view, visit https://gerrit.wikimedia.org/r/384192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bab94ff404947870b774e7f982af7612030b28e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits