Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java

Issue 2822293003: Change highlight int to Integer (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
index 5707714a477b343132bd0255c09796b18a609cc5..388c035a6c1fc1475d4dd1d5a45fe4421860f1d1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java
@@ -11,7 +11,6 @@ import android.animation.ObjectAnimator;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
-import android.support.annotation.IdRes;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -102,8 +101,7 @@ class AppMenuAdapter extends BaseAdapter {
private final LayoutInflater mInflater;
private final List<MenuItem> mMenuItems;
private final int mNumMenuItems;
- @IdRes
- private final int mHighlightedItemId;
+ private final Integer mHighlightedItemId;
private final float mDpToPx;
// Use a single PulseDrawable to spawn the other drawables so that the ConstantState gets
@@ -113,7 +111,7 @@ class AppMenuAdapter extends BaseAdapter {
private PulseDrawable mHighlightDrawableSource;
public AppMenuAdapter(AppMenu appMenu, List<MenuItem> menuItems, LayoutInflater inflater,
- @IdRes int highlightedItemId) {
+ Integer highlightedItemId) {
mAppMenu = appMenu;
mMenuItems = menuItems;
mInflater = inflater;
@@ -445,6 +443,8 @@ class AppMenuAdapter extends BaseAdapter {
}
private void highlightItemIfNecessary(View view, boolean isIcon, int itemId) {
+ if (mHighlightedItemId == null) return;
+
Drawable background = (Drawable) view.getTag(R.id.menu_item_original_background);
if (background == null) return;

Powered by Google App Engine
This is Rietveld 408576698