diff options
author | Tony Wickham <twickham@google.com> | 2018-05-09 20:13:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-09 20:13:23 +0000 |
commit | 56b247da1d8b25dce5e34d453ff98f69097ae411 (patch) | |
tree | cfdfabbf90940d6c332ba504e1fc0c5d9bf91957 /src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | |
parent | f69f0c2bf0a8af73d3af2994e2bd3f95f244454e (diff) | |
parent | 6becf7c07d4714369d40dcd575a99855894c0f8a (diff) | |
download | android_packages_apps_Trebuchet-56b247da1d8b25dce5e34d453ff98f69097ae411.tar.gz android_packages_apps_Trebuchet-56b247da1d8b25dce5e34d453ff98f69097ae411.tar.bz2 android_packages_apps_Trebuchet-56b247da1d8b25dce5e34d453ff98f69097ae411.zip |
Merge "Add atomic recents animation while swiping up" into ub-launcher3-edmonton
Diffstat (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java')
-rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 58 |
1 files changed, 38 insertions, 20 deletions
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 157dc1bf3..d6b234934 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -23,6 +23,7 @@ import static com.android.launcher3.LauncherState.HOTSEAT_SEARCH_BOX; import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; import android.view.View; +import android.view.animation.Interpolator; import com.android.launcher3.LauncherState.PageAlphaProvider; import com.android.launcher3.LauncherStateManager.AnimationConfig; @@ -47,12 +48,12 @@ public class WorkspaceStateTransitionAnimation { } public void setState(LauncherState toState) { - setWorkspaceProperty(toState, NO_ANIM_PROPERTY_SETTER); + setWorkspaceProperty(toState, NO_ANIM_PROPERTY_SETTER, new AnimationConfig()); } public void setStateWithAnimation(LauncherState toState, AnimatorSetBuilder builder, AnimationConfig config) { - setWorkspaceProperty(toState, config.getPropertySetter(builder)); + setWorkspaceProperty(toState, config.getPropertySetter(builder), config); } public float getFinalScale() { @@ -62,28 +63,40 @@ public class WorkspaceStateTransitionAnimation { /** * Starts a transition animation for the workspace. */ - private void setWorkspaceProperty(LauncherState state, PropertySetter propertySetter) { + private void setWorkspaceProperty(LauncherState state, PropertySetter propertySetter, + AnimationConfig config) { float[] scaleAndTranslation = state.getWorkspaceScaleAndTranslation(mLauncher); mNewScale = scaleAndTranslation[0]; PageAlphaProvider pageAlphaProvider = state.getWorkspacePageAlphaProvider(mLauncher); final int childCount = mWorkspace.getChildCount(); for (int i = 0; i < childCount; i++) { applyChildState(state, (CellLayout) mWorkspace.getChildAt(i), i, pageAlphaProvider, - propertySetter); + propertySetter, config); } - propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, Interpolators.ZOOM_OUT); - propertySetter.setFloat(mWorkspace, View.TRANSLATION_X, - scaleAndTranslation[1], Interpolators.ZOOM_OUT); - propertySetter.setFloat(mWorkspace, View.TRANSLATION_Y, - scaleAndTranslation[2], Interpolators.ZOOM_OUT); int elements = state.getVisibleElements(mLauncher); - float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0; - propertySetter.setViewAlpha(mLauncher.getHotseat().getLayout(), hotseatIconsAlpha, - pageAlphaProvider.interpolator); - propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(), - hotseatIconsAlpha, pageAlphaProvider.interpolator); + boolean playAtomicComponent = config.playAtomicComponent(); + if (playAtomicComponent) { + propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, Interpolators.ZOOM_OUT); + float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0; + propertySetter.setViewAlpha(mLauncher.getHotseat().getLayout(), hotseatIconsAlpha, + pageAlphaProvider.interpolator); + propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(), + hotseatIconsAlpha, pageAlphaProvider.interpolator); + } + + if (!config.playNonAtomicComponent()) { + // Only the alpha and scale, handled above, are included in the atomic animation. + return; + } + + Interpolator translationInterpolator = !playAtomicComponent ? Interpolators.LINEAR + : Interpolators.ZOOM_OUT; + propertySetter.setFloat(mWorkspace, View.TRANSLATION_X, + scaleAndTranslation[1], translationInterpolator); + propertySetter.setFloat(mWorkspace, View.TRANSLATION_Y, + scaleAndTranslation[2], translationInterpolator); propertySetter.setViewAlpha(mLauncher.getHotseatSearchBox(), (elements & HOTSEAT_SEARCH_BOX) != 0 ? 1 : 0, @@ -96,17 +109,22 @@ public class WorkspaceStateTransitionAnimation { public void applyChildState(LauncherState state, CellLayout cl, int childIndex) { applyChildState(state, cl, childIndex, state.getWorkspacePageAlphaProvider(mLauncher), - NO_ANIM_PROPERTY_SETTER); + NO_ANIM_PROPERTY_SETTER, new AnimationConfig()); } private void applyChildState(LauncherState state, CellLayout cl, int childIndex, - PageAlphaProvider pageAlphaProvider, PropertySetter propertySetter) { + PageAlphaProvider pageAlphaProvider, PropertySetter propertySetter, + AnimationConfig config) { float pageAlpha = pageAlphaProvider.getPageAlpha(childIndex); int drawableAlpha = Math.round(pageAlpha * (state.hasWorkspacePageBackground ? 255 : 0)); - propertySetter.setInt(cl.getScrimBackground(), - DRAWABLE_ALPHA, drawableAlpha, Interpolators.ZOOM_OUT); - propertySetter.setFloat(cl.getShortcutsAndWidgets(), View.ALPHA, - pageAlpha, pageAlphaProvider.interpolator); + if (config.playNonAtomicComponent()) { + propertySetter.setInt(cl.getScrimBackground(), + DRAWABLE_ALPHA, drawableAlpha, Interpolators.ZOOM_OUT); + } + if (config.playAtomicComponent()) { + propertySetter.setFloat(cl.getShortcutsAndWidgets(), View.ALPHA, + pageAlpha, pageAlphaProvider.interpolator); + } } }
\ No newline at end of file |