jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343102 )
Change subject: Don't tint Share action item when highlighting text.
......................................................................
Don't tint Share action item when highlighting text.
This now conflicts with the background color of the toolbar, and is no
longer necessary.
Also remove unnecessary API version check.
Bug: T160658
Change-Id: Ie3f6985efcdf07ceee4c2ce11866b6ad17d433d0
---
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
1 file changed, 2 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index 39c236a..356b6fd 100755
--- a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -3,14 +3,12 @@
import android.content.DialogInterface;
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.os.Build;
import android.support.annotation.ColorInt;
import android.support.annotation.ColorRes;
import android.support.annotation.IntegerRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@@ -165,7 +163,7 @@
private void handleSelection(Menu menu, MenuItem shareItem) {
if
(WikipediaApp.getInstance().getOnboardingStateMachine().isShareTutorialEnabled())
{
- showShareOnboarding(shareItem);
+ postShowShareToolTip(shareItem);
WikipediaApp.getInstance().getOnboardingStateMachine().setShareTutorial();
}
@@ -188,7 +186,7 @@
}
MenuItem editItem = menu.findItem(R.id.menu_text_edit_here);
editItem.setOnMenuItemClickListener(new
RequestTextSelectOnMenuItemClickListener(PAYLOAD_PURPOSE_EDIT_HERE));
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN ||
!fragment.getPage().isArticle()) {
+ if (!fragment.getPage().isArticle()) {
editItem.setVisible(false);
}
@@ -203,11 +201,6 @@
private boolean isWiktionaryDialogEnabledForArticleLanguage() {
return Arrays.asList(WiktionaryDialog.getEnabledLanguages())
.contains(fragment.getTitle().getWikiSite().languageCode());
- }
-
- private void showShareOnboarding(MenuItem shareItem) {
- DrawableCompat.setTint(shareItem.getIcon(),
getColor(SHARE_TOOL_TIP_COLOR));
- postShowShareToolTip(shareItem);
}
private void postShowShareToolTip(final MenuItem shareItem) {
--
To view, visit https://gerrit.wikimedia.org/r/343102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3f6985efcdf07ceee4c2ce11866b6ad17d433d0
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
