summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-03-09 18:13:56 -0800
committerMichael Kolb <kolby@google.com>2011-03-09 18:15:26 -0800
commit3aaef25f9da07c3399beb661a52711e24dca8c60 (patch)
treefc034bce23f8ee6c4a6c3f1a89f7c0fd82f6a861
parent208f1948017c10cccc52d97355f7fb79bbddc186 (diff)
downloadpackages_apps_Browser-3aaef25f9da07c3399beb661a52711e24dca8c60.zip
packages_apps_Browser-3aaef25f9da07c3399beb661a52711e24dca8c60.tar.gz
packages_apps_Browser-3aaef25f9da07c3399beb661a52711e24dca8c60.tar.bz2
set correct url icon when setting tab
Bug: 4075824 Change-Id: I6f053d9ef9c4562ed5dd3a727eeef8b25c709dd5
-rw-r--r--src/com/android/browser/TitleBarXLarge.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 8a715b1..193538a 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -16,16 +16,14 @@
package com.android.browser;
-import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher;
import com.android.browser.UI.DropdownChangeListener;
+import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher;
import com.android.browser.search.SearchEngine;
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
-import android.database.DataSetObserver;
import android.graphics.Bitmap;
-import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.view.KeyEvent;
@@ -40,7 +38,6 @@ import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -84,8 +81,8 @@ public class TitleBarXLarge extends TitleBarBase
R.drawable.textfield_active_holo_dark);
mUnfocusDrawable = resources.getDrawable(
R.drawable.textfield_default_holo_dark);
- initLayout(activity);
mInVoiceMode = false;
+ initLayout(activity);
}
@Override
@@ -380,7 +377,9 @@ public class TitleBarXLarge extends TitleBarBase
public void setInVoiceMode(boolean voicemode, List<String> voiceResults) {
mInVoiceMode = voicemode;
mUrlInput.setVoiceResults(voiceResults);
- mUrlIcon.setImageDrawable(mSearchButton.getDrawable());
+ if (voicemode) {
+ mUrlIcon.setImageDrawable(mSearchButton.getDrawable());
+ }
}
@Override