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

Commit aa900561 authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

Change expand animation for private space container. 

Only scroll to bottom. Don't use the animation.

bug: 299294792
test: manual:
video: https://drive.google.com/file/d/134Mq0MX0xauRfkNv8LGXOZgweRjqrmTa/view?usp=sharing
Flag: ACONFIG com.android.launcher3.Flags.private_space_animation TEAMFOOD
Change-Id: Ie6666638a53e334bddb1700674c2c49eb5788a06
parent 7c44333f

src/com/android/launcher3/FastScrollRecyclerView.java

+2 −2
Original line number Diff line number Diff line
@@ -197,11 +197,11 @@ public abstract class FastScrollRecyclerView extends RecyclerView { 
    /**

     * Scrolls this recycler view to the bottom with easing and duration.

     */

    public void scrollToBottomWithMotion() {

    public void scrollToBottomWithMotion(int duration) {

        if (mScrollbar != null) {

            mScrollbar.reattachThumbToScroll();

        }

        // Emphasized interpolators with 500ms duration

        smoothScrollBy(0, getAvailableScrollHeight(), Interpolators.EMPHASIZED, 500);

        smoothScrollBy(0, getAvailableScrollHeight(), Interpolators.EMPHASIZED, duration);

    }

}

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+2 −1
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
    public static final float PULL_MULTIPLIER = .02f;

    public static final float FLING_VELOCITY_MULTIPLIER = 1200f;

    protected static final String BUNDLE_KEY_CURRENT_PAGE = "launcher.allapps.current_page";

    private static final int SCROLL_TO_BOTTOM_DURATION = 500;

    private static final long DEFAULT_SEARCH_TRANSITION_DURATION_MS = 300;

    // Render the header protection at all times to debug clipping issues.

    private static final boolean DEBUG_HEADER_PROTECTION = false;
@@ -515,7 +516,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
            // Switch to the main tab

            switchToTab(ActivityAllAppsContainerView.AdapterHolder.MAIN);

            // Scroll to bottom

            getActiveRecyclerView().scrollToBottomWithMotion();

            getActiveRecyclerView().scrollToBottomWithMotion(SCROLL_TO_BOTTOM_DURATION);

        });

    }

src/com/android/launcher3/allapps/PrivateSpaceHeaderViewController.java

+1 −5
Original line number Diff line number Diff line
@@ -120,11 +120,7 @@ public class PrivateSpaceHeaderViewController { 
                (ActivityAllAppsContainerView<?>.AdapterHolder) mAllApps.mAH.get(MAIN);

        if (Flags.enablePrivateSpace() && Flags.privateSpaceAnimation()

                && mAllApps.getActiveRecyclerView() == mainAdapterHolder.mRecyclerView) {

            RecyclerViewAnimationController recyclerViewAnimationController =

                    new RecyclerViewAnimationController(mAllApps);

            recyclerViewAnimationController.animateToState(true /* expand */,

                    ANIMATION_DURATION, () -> {});

            mAllApps.getActiveRecyclerView().scrollToBottomWithMotion();

            mAllApps.getActiveRecyclerView().scrollToBottomWithMotion(ANIMATION_DURATION);

        }

    }