summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-09-18 10:48:25 -0400
committerJohn Spurlock <jspurlock@google.com>2013-09-18 10:51:31 -0400
commit2c38e70acd92372669cf93c2049ad162650a43ba (patch)
tree4eaca323396122f8b2095ecab8c8d8cce87d8ef9 /src
parent5664de2524be15329882bf81925d08b5de760b8c (diff)
downloadandroid_packages_apps_Trebuchet-2c38e70acd92372669cf93c2049ad162650a43ba.tar.gz
android_packages_apps_Trebuchet-2c38e70acd92372669cf93c2049ad162650a43ba.tar.bz2
android_packages_apps_Trebuchet-2c38e70acd92372669cf93c2049ad162650a43ba.zip
Fix launcher3 standalone build.
Change-Id: Ibfe14c5960211916222fc49389b8776be6bf768b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d70a3a9fb..6e6cdf6d7 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3358,8 +3358,8 @@ public class Launcher extends Activity
// We disable both search and voice search when there is no global search provider
if (searchButtonContainer != null) searchButtonContainer.setVisibility(View.GONE);
if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
- searchButton.setVisibility(View.GONE);
- voiceButton.setVisibility(View.GONE);
+ if (searchButton != null) searchButton.setVisibility(View.GONE);
+ if (voiceButton != null) voiceButton.setVisibility(View.GONE);
setVoiceButtonProxyVisible(false);
return false;
}
@@ -3412,7 +3412,7 @@ public class Launcher extends Activity
return true;
} else {
if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
- voiceButton.setVisibility(View.GONE);
+ if (voiceButton != null) voiceButton.setVisibility(View.GONE);
setVoiceButtonProxyVisible(false);
return false;
}