commit 11d1978d8d16004598347abc93918b54a5ef760b
author Michael Kolb <kolby@google.com> Sun Mar 20 10:17:40 2011 -0700
committer Michael Kolb <kolby@google.com> Wed Mar 23 12:54:12 2011 -0700
tree b3941e98c31d7c9346d594f7a3f5591745e25778
parent 71791a09579b21ef61f00c38056497cd99667440

fix title bar

    Merge code from TitleBarXLarge down into base
    to support omnibox in both tablet and phone
    browser

Change-Id: If54f3b162725411236f0b0676887bbcbdabadd25

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 9c3c912..efd6c43 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -39,7 +39,7 @@
 
     private static final String LOGTAG = "PhoneUi";
 
-    private TitleBar mTitleBar;
+    private TitleBarPhone mTitleBar;
     private ActiveTabsPage mActiveTabsPage;
     private TouchProxy mTitleOverlay;
 
@@ -52,7 +52,7 @@
      */
     public PhoneUi(Activity browser, UiController controller) {
         super(browser, controller);
-        mTitleBar = new TitleBar(mActivity, mUiController, this);
+        mTitleBar = new TitleBarPhone(mActivity, mUiController, this);
         // mTitleBar will be always be shown in the fully loaded mode on
         // phone
         mTitleBar.setProgress(100);
@@ -130,7 +130,8 @@
         }
         view.setEmbeddedTitleBar(getTitleBar());
         if (tab.isInVoiceSearchMode()) {
-            showVoiceTitleBar(tab.getVoiceDisplayTitle());
+            showVoiceTitleBar(tab.getVoiceDisplayTitle(),
+                    tab.getVoiceSearchResults());
         } else {
             revertVoiceTitleBar(tab);
         }
@@ -298,4 +299,5 @@
             return params;
         }
     }
+
 }