Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b4e2d79 authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

Don't show fastScrollBar when collapsing

bug:299294792
Test manual vids:
before:https://drive.google.com/file/d/1SG9GeU1c-x2p0KT5pQ32RsOHnm0eRbUm/view?usp=sharing
after:https://drive.google.com/file/d/1RsS1yWZ6Qufxf-Odff7mLSCt3j2usPi-/view?usp=sharing
Flag: ACONFIG com.android.launcher3.Flags.private_space_animation TRUNKFOOD

Change-Id: Id94c1ba386f5469242042a5afd7bb566a730cf83
parent d7161bf6
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.launcher3.allapps;

import static android.view.View.GONE;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;

import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
@@ -49,6 +50,7 @@ import com.android.launcher3.R;
import com.android.launcher3.allapps.UserProfileManager.UserProfileState;
import com.android.launcher3.anim.AnimatedPropertySetter;
import com.android.launcher3.anim.PropertySetter;
import com.android.launcher3.views.RecyclerViewFastScroller;

import java.util.List;

@@ -220,11 +222,15 @@ public class PrivateSpaceHeaderViewController {
    private ValueAnimator animateCollapseAnimation(ViewGroup lockButton) {
        float from = 1;
        float to = 0;
        RecyclerViewFastScroller scrollBar = mAllApps.getActiveRecyclerView().getScrollbar();
        ValueAnimator collapseAnim = ValueAnimator.ofFloat(from, to);
        collapseAnim.setDuration(EXPAND_COLLAPSE_DURATION);
        collapseAnim.addListener(new AnimatorListenerAdapter() {
            @Override
            public void onAnimationStart(Animator animation) {
                if (scrollBar != null) {
                    scrollBar.setVisibility(INVISIBLE);
                }
                // scroll up
                collapse();
                // Animate the collapsing of the text.
@@ -233,6 +239,10 @@ public class PrivateSpaceHeaderViewController {
            @Override
            public void onAnimationEnd(Animator animation) {
                super.onAnimationEnd(animation);
                if (scrollBar != null) {
                    scrollBar.setThumbOffsetY(-1);
                    scrollBar.setVisibility(VISIBLE);
                }
                mPrivateProfileManager.lockPrivateProfile();
            }
        });