commit 6265b744c3097c24e42ee62ca0969ab9c4d6a91b
author John Reck <jreck@google.com> Tue Jul 19 17:04:17 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 19 17:04:17 2011 -0700
tree ff7cbdd554c45ead01a1484bb492453c5eef19ef
parent 5e8f2b9cf44263ac77a21653eb3c012a98c3587f
parent 86374729c42dae85147d207d03903a949b27ef43

Merge "Remove size from phone snapshot layout"

src/com/android/browser/NavigationBarPhone.java

diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index 7e367a4..2030169 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -116,11 +116,11 @@
     @Override
     public void onProgressStopped() {
         super.onProgressStopped();
-        mStopButton.setVisibility(View.GONE);
         mStopButton.setImageDrawable(mRefreshDrawable);
         if (!isEditingUrl()) {
             mComboIcon.setVisibility(View.VISIBLE);
         }
+        onStateChanged(mUrlInput.getState());
     }
 
     /**
@@ -236,7 +236,7 @@
         case StateListener.STATE_NORMAL:
             mComboIcon.setVisibility(View.VISIBLE);
             mStopButton.setVisibility(View.GONE);
-            setSearchMode(false);
+            setSearchMode(mInVoiceMode);
             mTabSwitcher.setVisibility(View.VISIBLE);
             mTitleContainer.setBackgroundDrawable(null);
             mMore.setVisibility(mNeedsMenu ? View.VISIBLE : View.GONE);

src/com/android/browser/UrlInputView.java

diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 8b5c292..2acc69b 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -187,6 +187,10 @@
         }
     }
 
+    int getState() {
+        return mState;
+    }
+
     void setVoiceResults(List<String> voiceResults) {
         mAdapter.setVoiceResults(voiceResults);
     }