commit ca9ecfbb05d61a72bad739a24dae771b1bbaa683
author Sagar Dhawan <sdhawan@codeaurora.org> Mon Aug 10 17:27:58 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:47 2015 +0200
tree 0273de3074530525bb5565cb7807ae57006fa153
parent 6014dad6acf443eb1b06ba064eb06ae8ea26229f

Multiple fixes for Favicons

- Per Site Settings now uses SiteTiles and shows favicons
- New default Favicon
- Fixed missing Favicons on History items

Change-Id: Ia0317694ede81d62ce04e0693f9779f65030165c

src/com/android/browser/BrowserWebView.java

diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java
index 9aa044c..afcca1a 100644
--- a/src/com/android/browser/BrowserWebView.java
+++ b/src/com/android/browser/BrowserWebView.java
@@ -17,6 +17,8 @@
 package com.android.browser;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.content.res.Resources;
 import android.util.AttributeSet;
@@ -200,6 +202,16 @@
     }
 
     @Override
+    public Bitmap getFavicon() {
+        Tab currentTab = mTitleBar.getUiController().getCurrentTab();
+        if (currentTab != null){
+            return currentTab.getFavicon();
+        }
+        else return BitmapFactory.decodeResource(
+                this.getResources(), R.drawable.ic_deco_favicon_normal);
+    }
+
+    @Override
     public boolean dispatchKeyEventPreIme(KeyEvent event) {
         Tab currentTab = mTitleBar.getUiController().getCurrentTab();
         if (currentTab != null && currentTab.isKeyboardShowing()){