diff options
| author | Michael Kolb <kolby@google.com> | 2012-06-26 15:26:59 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2012-06-26 15:26:59 -0700 |
| commit | e721cc3336e6364475d0b9b0d7a6e46758f0e0b0 (patch) | |
| tree | ee8652e831e879d48995ee9b7334b009800c6d36 /src | |
| parent | db2bba29eb94115b4a10fc62fbe8daf1fc91fb7b (diff) | |
| download | packages_apps_browser-e721cc3336e6364475d0b9b0d7a6e46758f0e0b0.zip packages_apps_browser-e721cc3336e6364475d0b9b0d7a6e46758f0e0b0.tar.gz packages_apps_browser-e721cc3336e6364475d0b9b0d7a6e46758f0e0b0.tar.bz2 | |
Show voice button only on voice enabled devices
Bug: 6686590
Change-Id: If3a79ec8b848d0c5d001e0c38de5973bb6a166a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/NavigationBarPhone.java | 7 | ||||
| -rw-r--r-- | src/com/android/browser/NavigationBarTablet.java | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java index c3930d3..f3eaa2a 100644 --- a/src/com/android/browser/NavigationBarPhone.java +++ b/src/com/android/browser/NavigationBarPhone.java @@ -215,12 +215,12 @@ 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); - mVoiceButton.setVisibility(View.GONE); mMagnify.setVisibility(View.GONE); mTabSwitcher.setVisibility(View.VISIBLE); mTitleContainer.setBackgroundDrawable(null); @@ -230,7 +230,9 @@ public class NavigationBarPhone extends NavigationBarBase implements mComboIcon.setVisibility(View.GONE); mStopButton.setVisibility(View.VISIBLE); mClearButton.setVisibility(View.GONE); - mVoiceButton.setVisibility(View.VISIBLE); + if ((mUiController != null) && mUiController.supportsVoice()) { + mVoiceButton.setVisibility(View.VISIBLE); + } mMagnify.setVisibility(View.GONE); mTabSwitcher.setVisibility(View.GONE); mMore.setVisibility(View.GONE); @@ -240,7 +242,6 @@ public class NavigationBarPhone extends NavigationBarBase implements mComboIcon.setVisibility(View.GONE); mStopButton.setVisibility(View.GONE); mClearButton.setVisibility(View.VISIBLE); - mVoiceButton.setVisibility(View.GONE); mMagnify.setVisibility(View.VISIBLE); mTabSwitcher.setVisibility(View.GONE); mMore.setVisibility(View.GONE); diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java index 79c8de6..adfd5e7 100644 --- a/src/com/android/browser/NavigationBarTablet.java +++ b/src/com/android/browser/NavigationBarTablet.java @@ -322,19 +322,19 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe @Override public void onStateChanged(int state) { + mVoiceButton.setVisibility(View.GONE); 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); + if ((mUiController != null) && mUiController.supportsVoice()) { + mVoiceButton.setVisibility(View.VISIBLE); + } break; case STATE_EDITED: mClearButton.setVisibility(View.VISIBLE); - mVoiceButton.setVisibility(View.GONE); break; } } |