commit b2a275ecd2a5c02f2c4b51f5142e0d253746e534
author Winson Chung <winsonc@google.com> Mon May 07 15:40:54 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 07 15:40:54 2012 -0700
tree 1320b454fe02f95b9720f3812ae195aa85997cec
parent c60498a91d82ca7d73402d5a5dd8467cd7e0391c
parent ca889b34821583ea0e70abb403ebbdfe1a290d9e

Merge "Consistently re-enabling the wallpaper when we leave launcher. (Bug 6445085)" into jb-dev

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 984cf31..0614312 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2836,7 +2836,9 @@
             if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
             searchButton.setVisibility(View.GONE);
             voiceButton.setVisibility(View.GONE);
-            voiceButtonProxy.setVisibility(View.GONE);
+            if (voiceButtonProxy != null) {
+                voiceButtonProxy.setVisibility(View.GONE);
+            }
             return false;
         }
     }