diff options
| author | Winson Chung <winsonc@google.com> | 2015-04-17 12:11:01 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2015-04-17 12:51:27 -0700 |
| commit | 466663edeec8d889aca37612aab2ab2d67da4ad8 (patch) | |
| tree | 52211b77ce7d643cf53c4ef4e20dee227bbe641b /src/com/android/launcher3/Workspace.java | |
| parent | 9cbea78b19badc86299b0ac4254799d8a3bf9684 (diff) | |
| download | android_packages_apps_Trebuchet-466663edeec8d889aca37612aab2ab2d67da4ad8.tar.gz android_packages_apps_Trebuchet-466663edeec8d889aca37612aab2ab2d67da4ad8.tar.bz2 android_packages_apps_Trebuchet-466663edeec8d889aca37612aab2ab2d67da4ad8.zip | |
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
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
1 files changed, 3 insertions, 1 deletions
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; |