BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/176894
Change subject: Move adjustDrawableToTheme call to onCreateOptionsMenu ...................................................................... Move adjustDrawableToTheme call to onCreateOptionsMenu Saves a call when tapping on the overflow menu, and is more consistent with the rest of the adjustDrawableToTheme calls. Change-Id: I4aa6c8934b07093f1acc54f325af562b3b8e06d7 --- M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/94/176894/1 diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java index 103fb45..892d0b3 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java @@ -146,6 +146,7 @@ return; } inflater.inflate(R.menu.menu_page_actions, menu); + fragment.onCreateOptionsMenu(menu, inflater); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java index b0cbb4d..3f2d7fe 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java @@ -37,6 +37,7 @@ import android.app.AlertDialog; import android.content.Intent; import android.content.res.Resources; +import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.support.v4.view.MenuItemCompat; @@ -48,6 +49,7 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -566,9 +568,11 @@ } } - public void onPrepareOptionsMenu(Menu menu) { + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { app.adjustDrawableToTheme(menu.findItem(R.id.menu_toc).getIcon()); + } + public void onPrepareOptionsMenu(Menu menu) { switch (state) { case PageViewFragmentInternal.STATE_NO_FETCH: case PageViewFragmentInternal.STATE_INITIAL_FETCH: -- To view, visit https://gerrit.wikimedia.org/r/176894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4aa6c8934b07093f1acc54f325af562b3b8e06d7 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND <bsitzm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits