diff options
author | Tony Wickham <twickham@google.com> | 2018-06-19 17:23:11 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2018-06-20 16:58:21 -0700 |
commit | 17be4e71b2f6733b4ea4dd52c3a46e8b5ec0d360 (patch) | |
tree | c16f7fb5f9403fa9b8cf7c7f4e682460311f3ae1 /src/com/android/launcher3/allapps | |
parent | 0eb466ea2feafb3fbe75d7726dc60a219abe20ad (diff) | |
download | android_packages_apps_Trebuchet-17be4e71b2f6733b4ea4dd52c3a46e8b5ec0d360.tar.gz android_packages_apps_Trebuchet-17be4e71b2f6733b4ea4dd52c3a46e8b5ec0d360.tar.bz2 android_packages_apps_Trebuchet-17be4e71b2f6733b4ea4dd52c3a46e8b5ec0d360.zip |
Adjust interpolators when swiping from overview to all apps
- All apps content fades in quickly so that icons are opaque by the time
they are on screen
- Recents fades out late so that we don't see it as translucent while
the transition is continuing (the translucent icon top of tranclucent
task view looks bad, for instance)
- Fix colored scrim that appears over recents - was using 0 to 1 instead
of 255
Bug: 79867407
Change-Id: I4f50423157f7870c8d0708f586a72e3e5a7b6559
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 22 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/FloatingHeaderView.java | 8 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index ccd55863c..24a8d5145 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -5,6 +5,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS_HEADER; import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.LauncherState.VERTICAL_SWIPE_INDICATOR; +import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE; import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE; import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS; import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; @@ -151,7 +152,7 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil @Override public void setState(LauncherState state) { setProgress(state.getVerticalProgress(mLauncher)); - setAlphas(state, NO_ANIM_PROPERTY_SETTER); + setAlphas(state, null, new AnimatorSetBuilder()); onProgressAnimationEnd(); } @@ -164,7 +165,7 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil AnimatorSetBuilder builder, AnimationConfig config) { float targetProgress = toState.getVerticalProgress(mLauncher); if (Float.compare(mProgress, targetProgress) == 0) { - setAlphas(toState, config.getPropertySetter(builder)); + setAlphas(toState, config, builder); // Fail fast onProgressAnimationEnd(); return; @@ -186,19 +187,24 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil builder.play(anim); - setAlphas(toState, config.getPropertySetter(builder)); + setAlphas(toState, config, builder); } - private void setAlphas(LauncherState toState, PropertySetter setter) { + private void setAlphas(LauncherState toState, AnimationConfig config, + AnimatorSetBuilder builder) { + PropertySetter setter = config == null ? NO_ANIM_PROPERTY_SETTER + : config.getPropertySetter(builder); 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(hasHeaderExtra, hasContent, setter); + Interpolator allAppsFade = builder.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR); + setter.setViewAlpha(mAppsView.getSearchView(), hasHeader ? 1 : 0, allAppsFade); + setter.setViewAlpha(mAppsView.getContentView(), hasContent ? 1 : 0, allAppsFade); + setter.setViewAlpha(mAppsView.getScrollBar(), hasContent ? 1 : 0, allAppsFade); + mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasContent, setter, + allAppsFade); setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA, (visibleElements & VERTICAL_SWIPE_INDICATOR) != 0 ? 255 : 0, LINEAR); diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java index 462e7f34e..eaa777416 100644 --- a/src/com/android/launcher3/allapps/FloatingHeaderView.java +++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java @@ -15,8 +15,6 @@ */ package com.android.launcher3.allapps; -import static com.android.launcher3.anim.Interpolators.LINEAR; - import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Point; @@ -28,6 +26,7 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.animation.Interpolator; import android.widget.LinearLayout; import com.android.launcher3.R; @@ -227,8 +226,9 @@ public class FloatingHeaderView extends LinearLayout implements p.y = getTop() - mCurrentRV.getTop() - mParent.getTop(); } - public void setContentVisibility(boolean hasHeader, boolean hasContent, PropertySetter setter) { - setter.setViewAlpha(this, hasContent ? 1 : 0, LINEAR); + public void setContentVisibility(boolean hasHeader, boolean hasContent, PropertySetter setter, + Interpolator fadeInterpolator) { + setter.setViewAlpha(this, hasContent ? 1 : 0, fadeInterpolator); allowTouchForwarding(hasContent); } |