summaryrefslogtreecommitdiffstats
path: root/chrome/android
diff options
context:
space:
mode:
authornewt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 18:46:32 +0000
committernewt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 18:46:32 +0000
commitee9c49641afade5f6a5d38ed413e505293ba59e1 (patch)
tree837ab1ec6a88b06258be16e5cb61517098484d2f /chrome/android
parent510099056de8979629bde8ddd3a9b58e88a46774 (diff)
downloadchromium_src-ee9c49641afade5f6a5d38ed413e505293ba59e1.zip
chromium_src-ee9c49641afade5f6a5d38ed413e505293ba59e1.tar.gz
chromium_src-ee9c49641afade5f6a5d38ed413e505293ba59e1.tar.bz2
[Android] Rename icon.png to app_icon.png.
Review URL: https://codereview.chromium.org/11428093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android')
-rw-r--r--chrome/android/java/res/mipmap-hdpi/app_icon.png (renamed from chrome/android/java/res/mipmap-hdpi/icon.png)bin9727 -> 9727 bytes
-rw-r--r--chrome/android/java/res/mipmap-mdpi/app_icon.png (renamed from chrome/android/java/res/mipmap-mdpi/icon.png)bin5695 -> 5695 bytes
-rw-r--r--chrome/android/java/res/mipmap-xhdpi/app_icon.png (renamed from chrome/android/java/res/mipmap-xhdpi/icon.png)bin14168 -> 14168 bytes
-rw-r--r--chrome/android/java/res/mipmap-xxhdpi/app_icon.png (renamed from chrome/android/java/res/mipmap-xxhdpi/icon.png)bin24601 -> 24601 bytes
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java2
5 files changed, 1 insertions, 1 deletions
diff --git a/chrome/android/java/res/mipmap-hdpi/icon.png b/chrome/android/java/res/mipmap-hdpi/app_icon.png
index 81c820f..81c820f 100644
--- a/chrome/android/java/res/mipmap-hdpi/icon.png
+++ b/chrome/android/java/res/mipmap-hdpi/app_icon.png
Binary files differ
diff --git a/chrome/android/java/res/mipmap-mdpi/icon.png b/chrome/android/java/res/mipmap-mdpi/app_icon.png
index f248957..f248957 100644
--- a/chrome/android/java/res/mipmap-mdpi/icon.png
+++ b/chrome/android/java/res/mipmap-mdpi/app_icon.png
Binary files differ
diff --git a/chrome/android/java/res/mipmap-xhdpi/icon.png b/chrome/android/java/res/mipmap-xhdpi/app_icon.png
index 7c54fcb..7c54fcb 100644
--- a/chrome/android/java/res/mipmap-xhdpi/icon.png
+++ b/chrome/android/java/res/mipmap-xhdpi/app_icon.png
Binary files differ
diff --git a/chrome/android/java/res/mipmap-xxhdpi/icon.png b/chrome/android/java/res/mipmap-xxhdpi/app_icon.png
index 3db0ed3..3db0ed3 100644
--- a/chrome/android/java/res/mipmap-xxhdpi/icon.png
+++ b/chrome/android/java/res/mipmap-xxhdpi/app_icon.png
Binary files differ
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java
index 8f77b31..5bf8ec9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProviderSuggestionsCursor.java
@@ -71,7 +71,7 @@ class ChromeBrowserProviderSuggestionsCursor extends AbstractCursor {
return mCursor.getString(mCursor.getColumnIndex(BookmarkColumns.URL));
case COLUMN_SUGGEST_ICON_1:
// This is the icon displayed to the left of the result in QSB.
- return Integer.toString(R.mipmap.icon);
+ return Integer.toString(R.mipmap.app_icon);
case COLUMN_SUGGEST_LAST_ACCESS_HINT:
// After clearing history, the Chrome bookmarks database will have a last
// access time of 0 for all bookmarks. In the Android provider, this will