1 files changed, 2 insertions, 23 deletions
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index cdf73c7..d1920e8 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -38,13 +38,11 @@ public class NavigationBarPhone extends NavigationBarBase implements
     private ImageView mStopButton;
     private ImageView mMagnify;
     private ImageView mClearButton;
-    private ImageView mVoiceButton;
     private Drawable mStopDrawable;
     private Drawable mRefreshDrawable;
     private String mStopDescription;
     private String mRefreshDescription;
     private View mTabSwitcher;
-    private View mComboIcon;
     private View mTitleContainer;
     private View mMore;
     private Drawable mTextfieldBgDrawable;
@@ -71,20 +69,16 @@ public class NavigationBarPhone extends NavigationBarBase implements
         mStopButton.setOnClickListener(this);
         mClearButton = (ImageView) findViewById(R.id.clear);
         mClearButton.setOnClickListener(this);
-        mVoiceButton = (ImageView) findViewById(R.id.voice);
-        mVoiceButton.setOnClickListener(this);
         mMagnify = (ImageView) findViewById(R.id.magnify);
         mTabSwitcher = findViewById(R.id.tab_switcher);
         mTabSwitcher.setOnClickListener(this);
         mMore = findViewById(R.id.more);
         mMore.setOnClickListener(this);
-        mComboIcon = findViewById(R.id.iconcombo);
-        mComboIcon.setOnClickListener(this);
         mTitleContainer = findViewById(R.id.title_bg);
         setFocusState(false);
         Resources res = getContext().getResources();
-        mStopDrawable = res.getDrawable(R.drawable.ic_stop_dark);
-        mRefreshDrawable = res.getDrawable(R.drawable.ic_refresh_dark);
+        mStopDrawable = res.getDrawable(R.drawable.ic_stop);
+        mRefreshDrawable = res.getDrawable(R.drawable.ic_refresh);
         mStopDescription = res.getString(R.string.accessibility_button_stop);
         mRefreshDescription = res.getString(R.string.accessibility_button_refresh);
         mTextfieldBgDrawable = res.getDrawable(R.drawable.textfield_active_holo_dark);
@@ -100,7 +94,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
             mStopButton.setImageDrawable(mStopDrawable);
             mStopButton.setContentDescription(mStopDescription);
             if (mStopButton.getVisibility() != View.VISIBLE) {
-                mComboIcon.setVisibility(View.GONE);
                 mStopButton.setVisibility(View.VISIBLE);
             }
         }
@@ -111,9 +104,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
         super.onProgressStopped();
         mStopButton.setImageDrawable(mRefreshDrawable);
         mStopButton.setContentDescription(mRefreshDescription);
-        if (!isEditingUrl()) {
-            mComboIcon.setVisibility(View.VISIBLE);
-        }
         onStateChanged(mUrlInput.getState());
     }
 
@@ -153,10 +143,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
             showMenu(mMore);
         } else if (mClearButton == v) {
             mUrlInput.setText("");
-        } else if (mComboIcon == v) {
-            mUiController.showPageInfo();
-        } else if (mVoiceButton == v) {
-            mUiController.startVoiceRecognizer();
         } else {
             super.onClick(v);
         }
@@ -213,10 +199,8 @@ public class NavigationBarPhone extends NavigationBarBase implements
 
     @Override
     public void onStateChanged(int state) {
-        mVoiceButton.setVisibility(View.GONE);
         switch(state) {
         case StateListener.STATE_NORMAL:
-            mComboIcon.setVisibility(View.VISIBLE);
             mStopButton.setVisibility(View.GONE);
             mClearButton.setVisibility(View.GONE);
             mMagnify.setVisibility(View.GONE);
@@ -225,19 +209,14 @@ public class NavigationBarPhone extends NavigationBarBase implements
             mMore.setVisibility(View.VISIBLE);
             break;
         case StateListener.STATE_HIGHLIGHTED:
-            mComboIcon.setVisibility(View.GONE);
             mStopButton.setVisibility(View.VISIBLE);
             mClearButton.setVisibility(View.GONE);
-            if ((mUiController != null) && mUiController.supportsVoice()) {
-                mVoiceButton.setVisibility(View.VISIBLE);
-            }
             mMagnify.setVisibility(View.GONE);
             mTabSwitcher.setVisibility(View.GONE);
             mMore.setVisibility(View.GONE);
             mTitleContainer.setBackgroundDrawable(mTextfieldBgDrawable);
             break;
         case StateListener.STATE_EDITED:
-            mComboIcon.setVisibility(View.GONE);
             mStopButton.setVisibility(View.GONE);
             mClearButton.setVisibility(View.VISIBLE);
             mMagnify.setVisibility(View.VISIBLE);