Trebuchet : Ensure search bar doesn't show in hidden

If the user is in the app drawer, or settings panel mode,
a broadcast could cause a new search target bar to be added which
would reset visibility. Ensure visibility is restored.

Change-Id: I9eba1eb6ac36bc9873deab1b81e1bb00ee8d4999

1 files changed, 7 insertions, 4 deletions

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index d65b4759a..8bba13c9d 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -766,11 +766,9 @@ public class DeviceProfile {
                 (visibleChildCount-1) * overviewModeBarSpacerWidthPx;
     }
 
-    public void layout(Launcher launcher) {
+    public void layoutSearchBar(Launcher launcher) {
         // Update search bar for live settings
         searchBarVisible = isSearchBarEnabled(launcher);
-        searchBarSpaceHeightPx = 2 * edgeMarginPx + (searchBarVisible ?
-                searchBarSpaceHeightPx - getSearchBarTopOffset() : 3 * edgeMarginPx);
         FrameLayout.LayoutParams lp;
         Resources res = launcher.getResources();
         boolean hasVerticalBarLayout = isVerticalBarLayout();
@@ -818,10 +816,15 @@ public class DeviceProfile {
             vglp.height = LayoutParams.MATCH_PARENT;
             qsbBar.setLayoutParams(vglp);
         }
+    }
 
+    public void layout(Launcher launcher) {
+        layoutSearchBar(launcher);
+        Resources res = launcher.getResources();
+        boolean hasVerticalBarLayout = isVerticalBarLayout();
         // Layout the workspace
         PagedView workspace = (PagedView) launcher.findViewById(R.id.workspace);
-        lp = (FrameLayout.LayoutParams) workspace.getLayoutParams();
+        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) workspace.getLayoutParams();
         lp.gravity = Gravity.CENTER;
         int orientation = isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT;
         Rect padding = getWorkspacePadding(orientation);