Launcher3: Consider extra header content as visible elements

Invoking extra header content such as floating header (predictions view)
causes the overview panel to show under recent task. The search bar doesn't
show in this case since it expects to scrim based on all apps content.

Since predictions appear in this area, set the search bar to show as well,
otherwise we get empty space above the predictions view.

Change-Id: I7eb68f4bc2efdc383f0ced5ff4a0ad13e9bed528
Signed-off-by: Pranav Vashi <[email protected]>

Author: Chris Crump

src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java

@@ -20,6 +20,7 @@
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
 import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
+import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
 import static com.android.launcher3.Utilities.prefixTextWithIcon;
 import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
 
@@ -233,6 +234,9 @@ public float getScrollRangeDelta(Rect insets) {
     @Override
     public void setContentVisibility(int visibleElements, PropertySetter setter,
             Interpolator interpolator) {
-        setter.setViewAlpha(this, (visibleElements & ALL_APPS_HEADER) != 0 ? 1 : 0, interpolator);
+        boolean hasAllAppsHeaderExtra = mAppsView != null
+                    && mAppsView.getFloatingHeaderView().hasVisibleContent();
+        int headerElement = hasAllAppsHeaderExtra ? ALL_APPS_HEADER_EXTRA : ALL_APPS_HEADER;
+        setter.setViewAlpha(this, (visibleElements & headerElement) != 0 ? 1 : 0, interpolator);
     }
 }