diff options
author | Michael Kolb <kolby@google.com> | 2012-06-04 16:31:58 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2012-06-04 16:36:41 -0700 |
commit | 0b12912da64ff5b2917d4f50eb91df2e76457d08 (patch) | |
tree | 8b7400e74a8c9f59e6f5db0c62761e03ba5193c9 /src/com/android/browser/NavigationBarTablet.java | |
parent | 9d64d9a8016cc862296b20c4db545018373bdea5 (diff) | |
download | android_packages_apps_Gello-0b12912da64ff5b2917d4f50eb91df2e76457d08.tar.gz android_packages_apps_Gello-0b12912da64ff5b2917d4f50eb91df2e76457d08.tar.bz2 android_packages_apps_Gello-0b12912da64ff5b2917d4f50eb91df2e76457d08.zip |
Enable voice search in omnibox
Bug: 6601348
Bring back voice search. Also fixes focus bug for fixed titlebar.
Change-Id: I83c8ad96957b62c23ad0bbb35685712687d11213
Diffstat (limited to 'src/com/android/browser/NavigationBarTablet.java')
-rw-r--r-- | src/com/android/browser/NavigationBarTablet.java | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java index 426174b9..79c8de65 100644 --- a/src/com/android/browser/NavigationBarTablet.java +++ b/src/com/android/browser/NavigationBarTablet.java @@ -32,10 +32,9 @@ import android.widget.ImageButton; import android.widget.ImageView; import com.android.browser.UI.ComboViews; +import com.android.browser.UrlInputView.StateListener; -import java.util.List; - -public class NavigationBarTablet extends NavigationBarBase { +public class NavigationBarTablet extends NavigationBarBase implements StateListener { private Drawable mStopDrawable; private Drawable mReloadDrawable; @@ -51,6 +50,7 @@ public class NavigationBarTablet extends NavigationBarBase { private ImageView mStopButton; private View mAllButton; private View mClearButton; + private View mVoiceButton; private View mNavButtons; private Drawable mFocusDrawable; private Drawable mUnfocusDrawable; @@ -99,6 +99,7 @@ public class NavigationBarTablet extends NavigationBarBase { mStopButton = (ImageView) findViewById(R.id.stop); mSearchButton = (ImageView) findViewById(R.id.search); mClearButton = findViewById(R.id.clear); + mVoiceButton = findViewById(R.id.voice); mUrlContainer = findViewById(R.id.urlbar_focused); mBackButton.setOnClickListener(this); mForwardButton.setOnClickListener(this); @@ -107,7 +108,9 @@ public class NavigationBarTablet extends NavigationBarBase { mStopButton.setOnClickListener(this); mSearchButton.setOnClickListener(this); mClearButton.setOnClickListener(this); + mVoiceButton.setOnClickListener(this); mUrlInput.setContainer(mUrlContainer); + mUrlInput.setStateListener(this); } public void onConfigurationChanged(Configuration config) { @@ -176,6 +179,8 @@ public class NavigationBarTablet extends NavigationBarBase { stopOrRefresh(); } else if (mClearButton == v) { clearOrClose(); + } else if (mVoiceButton == v) { + mUiController.startVoiceRecognizer(); } else { super.onClick(v); } @@ -217,14 +222,12 @@ public class NavigationBarTablet extends NavigationBarBase { } mSearchButton.setVisibility(View.GONE); mStar.setVisibility(View.GONE); - mClearButton.setVisibility(View.VISIBLE); mUrlIcon.setImageResource(R.drawable.ic_search_holo_dark); } else { if (mHideNavButtons) { showNavButtons(); } showHideStar(mUiController.getCurrentTab()); - mClearButton.setVisibility(View.GONE); if (mTitleBar.useQuickControls()) { mSearchButton.setVisibility(View.GONE); } else { @@ -289,6 +292,7 @@ public class NavigationBarTablet extends NavigationBarBase { mAnimation.cancel(); } mNavButtons.setVisibility(View.VISIBLE); + mNavButtons.setTranslationX(0); if (!mBaseUi.blockFocusAnimations()) { int awidth = mNavButtons.getMeasuredWidth(); Animator anim1 = ObjectAnimator.ofFloat(mNavButtons, @@ -316,4 +320,23 @@ public class NavigationBarTablet extends NavigationBarBase { } } + @Override + public void onStateChanged(int state) { + switch(state) { + case STATE_NORMAL: + mClearButton.setVisibility(View.GONE); + mVoiceButton.setVisibility(View.GONE); + + break; + case STATE_HIGHLIGHTED: + mClearButton.setVisibility(View.GONE); + mVoiceButton.setVisibility(View.VISIBLE); + break; + case STATE_EDITED: + mClearButton.setVisibility(View.VISIBLE); + mVoiceButton.setVisibility(View.GONE); + break; + } + } + } |