Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java |
index 32e724140f34c6a54d55fa021feca9ffc9c38ac4..4c6e65460f7e4a326f4b80059cd19c98d21e6908 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItem.java |
@@ -5,56 +5,71 @@ |
package org.chromium.chrome.browser.contextmenu; |
import android.content.Context; |
+import android.graphics.drawable.Drawable; |
+import android.support.annotation.DrawableRes; |
import android.support.annotation.IdRes; |
+import android.support.annotation.Nullable; |
import android.support.annotation.StringRes; |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.DefaultBrowserInfo; |
import org.chromium.chrome.browser.search_engines.TemplateUrlService; |
+import org.chromium.chrome.browser.widget.TintedDrawable; |
/** |
* List of all Context Menu Items available in Chrome. |
*/ |
public enum ContextMenuItem { |
// Custom Tab Group |
- OPEN_IN_NEW_CHROME_TAB(R.string.contextmenu_open_in_new_chrome_tab, |
- R.id.contextmenu_open_in_new_chrome_tab), |
- OPEN_IN_CHROME_INCOGNITO_TAB(R.string.contextmenu_open_in_chrome_incognito_tab, |
+ OPEN_IN_NEW_CHROME_TAB(R.drawable.context_menu_new_tab, |
+ R.string.contextmenu_open_in_new_chrome_tab, R.id.contextmenu_open_in_new_chrome_tab), |
+ OPEN_IN_CHROME_INCOGNITO_TAB(R.drawable.context_menu_incognito, |
+ R.string.contextmenu_open_in_chrome_incognito_tab, |
R.id.contextmenu_open_in_chrome_incognito_tab), |
- OPEN_IN_BROWSER_ID(0, R.id.contextmenu_open_in_browser_id), |
+ OPEN_IN_BROWSER_ID(R.drawable.context_menu_new_tab, 0, R.id.contextmenu_open_in_browser_id), |
// Link Group |
- OPEN_IN_OTHER_WINDOW(R.string.contextmenu_open_in_other_window, |
+ OPEN_IN_OTHER_WINDOW(R.drawable.context_menu_new_tab, R.string.contextmenu_open_in_other_window, |
R.id.contextmenu_open_in_other_window), |
- OPEN_IN_NEW_TAB(R.string.contextmenu_open_in_new_tab, R.id.contextmenu_open_in_new_tab), |
- OPEN_IN_INCOGNITO_TAB(R.string.contextmenu_open_in_incognito_tab, |
- R.id.contextmenu_open_in_incognito_tab), |
- COPY_LINK_ADDRESS(R.string.contextmenu_copy_link_address, R.id.contextmenu_copy_link_address), |
- COPY_LINK_TEXT(R.string.contextmenu_copy_link_text, R.id.contextmenu_copy_link_text), |
- SAVE_LINK_AS(R.string.contextmenu_save_link, R.id.contextmenu_save_link_as), |
+ OPEN_IN_NEW_TAB(R.drawable.context_menu_new_tab, R.string.contextmenu_open_in_new_tab, |
+ R.id.contextmenu_open_in_new_tab), |
+ OPEN_IN_INCOGNITO_TAB(R.drawable.context_menu_incognito, |
+ R.string.contextmenu_open_in_incognito_tab, R.id.contextmenu_open_in_incognito_tab), |
+ COPY_LINK_ADDRESS(R.drawable.context_menu_copy, R.string.contextmenu_copy_link_address, |
+ R.id.contextmenu_copy_link_address), |
+ COPY_LINK_TEXT(R.drawable.context_menu_copy, R.string.contextmenu_copy_link_text, |
+ R.id.contextmenu_copy_link_text), |
+ SAVE_LINK_AS(R.drawable.context_menu_download, R.string.contextmenu_save_link, |
+ R.id.contextmenu_save_link_as), |
// Image Group |
- LOAD_ORIGINAL_IMAGE(R.string.contextmenu_load_original_image, |
+ LOAD_ORIGINAL_IMAGE(0, R.string.contextmenu_load_original_image, |
R.id.contextmenu_load_original_image), |
- SAVE_IMAGE(R.string.contextmenu_save_image, R.id.contextmenu_save_image), |
- OPEN_IMAGE(R.string.contextmenu_open_image, R.id.contextmenu_open_image), |
- OPEN_IMAGE_IN_NEW_TAB(R.string.contextmenu_open_image_in_new_tab, |
- R.id.contextmenu_open_image_in_new_tab), |
- SEARCH_BY_IMAGE(R.string.contextmenu_search_web_for_image, R.id.contextmenu_search_by_image), |
- SHARE_IMAGE(R.string.contextmenu_share_image, R.id.contextmenu_share_image), |
+ SAVE_IMAGE(R.drawable.context_menu_download, R.string.contextmenu_save_image, |
+ R.id.contextmenu_save_image), |
+ OPEN_IMAGE(R.drawable.context_menu_new_tab, R.string.contextmenu_open_image, |
+ R.id.contextmenu_open_image), |
+ OPEN_IMAGE_IN_NEW_TAB(R.drawable.context_menu_new_tab, |
+ R.string.contextmenu_open_image_in_new_tab, R.id.contextmenu_open_image_in_new_tab), |
+ SEARCH_BY_IMAGE(R.drawable.context_menu_google, R.string.contextmenu_search_web_for_image, |
+ R.id.contextmenu_search_by_image), |
+ SHARE_IMAGE(R.drawable.context_menu_share, R.string.contextmenu_share_image, |
+ R.id.contextmenu_share_image), |
// Message Group |
- CALL(R.string.contextmenu_call, R.id.contextmenu_call), |
- SEND_MESSAGE(R.string.contextmenu_send_message, R.id.contextmenu_send_message), |
- ADD_TO_CONTACTS(R.string.contextmenu_add_to_contacts, R.id.contextmenu_add_to_contacts), |
- COPY(R.string.contextmenu_copy, R.id.contextmenu_copy), |
+ CALL(R.drawable.ic_phone_googblue_36dp, R.string.contextmenu_call, R.id.contextmenu_call), |
+ SEND_MESSAGE(0, R.string.contextmenu_send_message, R.id.contextmenu_send_message), |
JJ
2017/03/17 20:58:19
We're still waiting on icons for call and add_to_c
|
+ ADD_TO_CONTACTS(0, R.string.contextmenu_add_to_contacts, R.id.contextmenu_add_to_contacts), |
+ COPY(R.drawable.context_menu_copy, R.string.contextmenu_copy, R.id.contextmenu_copy), |
// Video Group |
- SAVE_VIDEO(R.string.contextmenu_save_video, R.id.contextmenu_save_video), |
- |
+ SAVE_VIDEO(R.drawable.context_menu_download, R.string.contextmenu_save_video, |
+ R.id.contextmenu_save_video), |
// Other |
- OPEN_IN_CHROME(R.string.menu_open_in_chrome, R.id.menu_id_open_in_chrome); |
+ OPEN_IN_CHROME(R.drawable.context_menu_new_tab, R.string.menu_open_in_chrome, |
+ R.id.menu_id_open_in_chrome); |
+ @DrawableRes public final int iconId; |
@StringRes public final int stringId; |
@IdRes public final int menuId; |
@@ -64,7 +79,8 @@ public enum ContextMenuItem { |
* @param stringId The string that describes the action of the item. |
David Trainor- moved to gerrit
2017/03/21 16:30:02
iconId in javadoc
JJ
2017/03/22 23:35:32
Done.
|
* @param menuId The id found in ids.xml |
*/ |
- ContextMenuItem(@StringRes int stringId, @IdRes int menuId) { |
+ ContextMenuItem(@DrawableRes int iconId, @StringRes int stringId, @IdRes int menuId) { |
+ this.iconId = iconId; |
this.stringId = stringId; |
this.menuId = menuId; |
} |
@@ -89,4 +105,17 @@ public enum ContextMenuItem { |
return context.getString(stringId); |
} |
+ |
+ /** |
+ * Transforms the icon id of the item into a tinted drawable of light_normal_color. |
Ted C
2017/03/21 16:29:39
In general, try to avoid writing your comments tha
JJ
2017/03/22 23:35:32
Done.
|
+ * @param context Responsible for getting the icon |
+ * @return If the icon has an id of 0 it returns null, otherwise it gets the proper drawable. |
Ted C
2017/03/21 16:29:39
the id == 0 is an internal detail, this can also b
JJ
2017/03/22 23:35:32
Done.
|
+ */ |
+ @Nullable |
+ Drawable getDrawable(Context context) { |
+ if (iconId == 0) return null; |
+ |
+ return TintedDrawable.constructTintedDrawable( |
David Trainor- moved to gerrit
2017/03/21 16:30:02
Do we access all icons like this? Should we just
JJ
2017/03/22 23:35:32
Many icons handed to me are not the correct shade.
David Trainor- moved to gerrit
2017/03/23 04:58:47
Yeah ask him to send you the tinted ones IMO. I d
|
+ context.getResources(), iconId, R.color.light_normal_color); |
+ } |
} |