summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@google.com>2013-06-11 15:46:07 +0100
committerBjorn Bringert <bringert@google.com>2013-06-11 15:46:07 +0100
commitecf33e4819d0c4b019706edd456ed14a6a0f200c (patch)
tree03c0ba48b9a3bfad2a761aafdcdbe4f5e0bef657
parentc459e5241ea0c53dd53c16e73fd7a187701f537b (diff)
downloadandroid_packages_apps_Trebuchet-ecf33e4819d0c4b019706edd456ed14a6a0f200c.tar.gz
android_packages_apps_Trebuchet-ecf33e4819d0c4b019706edd456ed14a6a0f200c.tar.bz2
android_packages_apps_Trebuchet-ecf33e4819d0c4b019706edd456ed14a6a0f200c.zip
Move control of voice button proxy visibility to a public method
Change-Id: I9dea07801fa608bebf2026667e71d684fc4b05d3
-rw-r--r--src/com/android/launcher3/Launcher.java20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f7b6c5ad4..bb264d60a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3159,7 +3159,6 @@ public class Launcher extends Activity
final ImageView searchButton = (ImageView) findViewById(R.id.search_button);
final View voiceButtonContainer = findViewById(R.id.voice_button_container);
final View voiceButton = findViewById(R.id.voice_button);
- final View voiceButtonProxy = findViewById(R.id.voice_button_proxy);
final SearchManager searchManager =
(SearchManager) getSystemService(Context.SEARCH_SERVICE);
@@ -3185,9 +3184,7 @@ public class Launcher extends Activity
if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
searchButton.setVisibility(View.GONE);
voiceButton.setVisibility(View.GONE);
- if (voiceButtonProxy != null) {
- voiceButtonProxy.setVisibility(View.GONE);
- }
+ setVoiceButtonProxyVisible(false);
return false;
}
}
@@ -3202,7 +3199,6 @@ public class Launcher extends Activity
private boolean updateVoiceSearchIcon(boolean searchVisible) {
final View voiceButtonContainer = findViewById(R.id.voice_button_container);
final View voiceButton = findViewById(R.id.voice_button);
- final View voiceButtonProxy = findViewById(R.id.voice_button_proxy);
// We only show/update the voice search icon if the search icon is enabled as well
final SearchManager searchManager =
@@ -3235,17 +3231,13 @@ public class Launcher extends Activity
}
if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.VISIBLE);
voiceButton.setVisibility(View.VISIBLE);
- if (voiceButtonProxy != null) {
- voiceButtonProxy.setVisibility(View.VISIBLE);
- }
+ setVoiceButtonProxyVisible(true);
invalidatePressedFocusedStates(voiceButtonContainer, voiceButton);
return true;
} else {
if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
voiceButton.setVisibility(View.GONE);
- if (voiceButtonProxy != null) {
- voiceButtonProxy.setVisibility(View.GONE);
- }
+ setVoiceButtonProxyVisible(false);
return false;
}
}
@@ -3257,6 +3249,12 @@ public class Launcher extends Activity
invalidatePressedFocusedStates(voiceButtonContainer, voiceButton);
}
+ public void setVoiceButtonProxyVisible(boolean visible) {
+ final View voiceButtonProxy = findViewById(R.id.voice_button_proxy);
+ if (voiceButtonProxy != null) {
+ voiceButtonProxy.setVisibility(visible ? View.VISIBLE : View.GONE);
+ }
+ }
/**
* Sets the app market icon
*/