diff options
author | Tony Wickham <twickham@google.com> | 2018-03-21 08:16:33 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2018-03-21 12:15:48 -0700 |
commit | bd6f05e0b6f57a8bb7f21bcaf17d0eebe8b0fe7c (patch) | |
tree | c89425603b17c606613337298164e914e0c6a9cf /src/com/android/launcher3/allapps | |
parent | c1b6157398c3af353983436ca9e4f4f1f108b221 (diff) | |
download | android_packages_apps_Trebuchet-bd6f05e0b6f57a8bb7f21bcaf17d0eebe8b0fe7c.tar.gz android_packages_apps_Trebuchet-bd6f05e0b6f57a8bb7f21bcaf17d0eebe8b0fe7c.tar.bz2 android_packages_apps_Trebuchet-bd6f05e0b6f57a8bb7f21bcaf17d0eebe8b0fe7c.zip |
Separate some elements to set visibility separately
Added entries for:
- All apps header extra content
- Hotseat extra content
Change-Id: I47c4ccfe3b54fd47cbbee88698ed045611e3e92d
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index bf8f531cc..fbd23d15a 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -2,6 +2,7 @@ package com.android.launcher3.allapps; import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT; import static com.android.launcher3.LauncherState.ALL_APPS_HEADER; +import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA; import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; @@ -179,12 +180,13 @@ public class AllAppsTransitionController private void setAlphas(LauncherState toState, PropertySetter setter) { int visibleElements = toState.getVisibleElements(mLauncher); boolean hasHeader = (visibleElements & ALL_APPS_HEADER) != 0; + boolean hasHeaderExtra = (visibleElements & ALL_APPS_HEADER_EXTRA) != 0; boolean hasContent = (visibleElements & ALL_APPS_CONTENT) != 0; setter.setViewAlpha(mAppsView.getSearchView(), hasHeader ? 1 : 0, LINEAR); setter.setViewAlpha(mAppsView.getContentView(), hasContent ? 1 : 0, LINEAR); setter.setViewAlpha(mAppsView.getScrollBar(), hasContent ? 1 : 0, LINEAR); - mAppsView.getFloatingHeaderView().setContentVisibility(hasHeader, hasContent, setter); + mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasContent, setter); } public AnimatorListenerAdapter getProgressAnimatorListener() { |