From 466663edeec8d889aca37612aab2ab2d67da4ad8 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 17 Apr 2015 12:11:01 -0700 Subject: Accounting for recent changes in padding when detecting backgound taps to close AllApps. - Also ensuring that we keep the search bar visible in all apps only if it is being overridden. Change-Id: Iba980ecec255da80aff8ff57b42ad99d70a2122a --- src/com/android/launcher3/Workspace.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/com/android/launcher3/Workspace.java') diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 043ecb075..671dcaa74 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2264,7 +2264,9 @@ public class Workspace extends SmoothPagedView float finalHotseatAndPageIndicatorAlpha = (stateIsNormal || stateIsSpringLoaded) ? 1f : 0f; float finalOverviewPanelAlpha = stateIsOverview ? 1f : 0f; // We keep the search bar visible on the workspace and in AllApps now - float finalSearchBarAlpha = (stateIsNormal || stateIsNormalHidden) ? 1f : 0f; + boolean showSearchBar = stateIsNormal || + (mLauncher.isAllAppsSearchOverridden() && stateIsNormalHidden); + float finalSearchBarAlpha = showSearchBar ? 1f : 0f; float finalWorkspaceTranslationY = stateIsOverview || stateIsOverviewHidden ? getOverviewModeTranslationY() : 0; -- cgit v1.2.3