Ensuring that Launcher always has a search bar. (Bug 10965514)

- Also disabling voice proxy when we are in now (Bug 10915381)

Change-Id: I4ad6392b5139d12b9b298110109b9363ba426cb4

src/com/android/launcher3/Workspace.java

@@ -1030,12 +1030,14 @@ public class Workspace extends SmoothPagedView
             if (mCustomContentCallbacks != null) {
                 mCustomContentCallbacks.onShow();
                 mCustomContentShowTime = System.currentTimeMillis();
+                mLauncher.setVoiceButtonProxyVisible(false);
             }
         } else if (hasCustomContent() && getNextPage() != 0 && mCustomContentShowing) {
             mCustomContentShowing = false;
             if (mCustomContentCallbacks != null) {
                 mCustomContentCallbacks.onHide();
                 mLauncher.resetQSBScroll();
+                mLauncher.setVoiceButtonProxyVisible(true);
             }
         }
     }