diff options
| author | John Reck <jreck@google.com> | 2011-08-11 11:34:44 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-08-11 14:19:43 -0700 |
| commit | 034637c74e84153bd1f7cdd922daaeb9f6af9b8e (patch) | |
| tree | 2588f733d54c1eab5c54760b4ba1197d01155b2f /src/com/android/browser/NavigationBarTablet.java | |
| parent | e3da7d615be4710da92a79e6ed70dc1982deda4c (diff) | |
| download | android_packages_apps_Gello-034637c74e84153bd1f7cdd922daaeb9f6af9b8e.tar.gz android_packages_apps_Gello-034637c74e84153bd1f7cdd922daaeb9f6af9b8e.tar.bz2 android_packages_apps_Gello-034637c74e84153bd1f7cdd922daaeb9f6af9b8e.zip | |
Tabs UI updated
Bug: 5153985
Change-Id: Icbe235f1c09a58199581c55bfb2d82318f13f7f7
Diffstat (limited to 'src/com/android/browser/NavigationBarTablet.java')
| -rw-r--r-- | src/com/android/browser/NavigationBarTablet.java | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java index e3059ea9..7f6992a4 100644 --- a/src/com/android/browser/NavigationBarTablet.java +++ b/src/com/android/browser/NavigationBarTablet.java @@ -22,6 +22,7 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; +import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.AttributeSet; @@ -53,6 +54,7 @@ public class NavigationBarTablet extends NavigationBarBase { private Drawable mFocusDrawable; private Drawable mUnfocusDrawable; private boolean mHideNavButtons; + private Drawable mFaviconDrawable; public NavigationBarTablet(Context context) { super(context); @@ -191,10 +193,25 @@ public class NavigationBarTablet extends NavigationBarBase { } } + @Override + public void setFavicon(Bitmap icon) { + mFaviconDrawable = mBaseUi.getFaviconDrawable(icon); + updateUrlIcon(); + } + void updateUrlIcon() { - mUrlIcon.setImageResource(mInVoiceMode ? - R.drawable.ic_search_holo_dark - : R.drawable.ic_web_holo_dark); + if (mUrlInput.hasFocus()) { + mUrlIcon.setImageResource(R.drawable.ic_search_holo_dark); + } else { + if (mInVoiceMode) { + mUrlIcon.setImageResource(R.drawable.ic_search_holo_dark); + } else { + if (mFaviconDrawable == null) { + mFaviconDrawable = mBaseUi.getFaviconDrawable(null); + } + mUrlIcon.setImageDrawable(mFaviconDrawable); + } + } } @Override |