diff options
| author | Michael Kolb <kolby@google.com> | 2011-03-09 18:23:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-09 18:23:58 -0800 |
| commit | c88ba2ec617ba7e9b156888c980c1f9044d32726 (patch) | |
| tree | 5aab0f36082260c319227e3336d8702a4280528c | |
| parent | f26289291f421f07396fa210574938e76e88a6dc (diff) | |
| parent | 3aaef25f9da07c3399beb661a52711e24dca8c60 (diff) | |
| download | packages_apps_Browser-c88ba2ec617ba7e9b156888c980c1f9044d32726.zip packages_apps_Browser-c88ba2ec617ba7e9b156888c980c1f9044d32726.tar.gz packages_apps_Browser-c88ba2ec617ba7e9b156888c980c1f9044d32726.tar.bz2 | |
Merge "set correct url icon when setting tab" into honeycomb-mr1
| -rw-r--r-- | src/com/android/browser/TitleBarXLarge.java | 11 |
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 |