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

Commit 2445ca07 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where FolderIcon stays visible during swipe up to home... 

Merge "Fix bug where FolderIcon stays visible during swipe up to home animation." into ub-launcher3-qt-dev
parents 692b5a26 e543818b

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides.states; 


import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.Launcher;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.userevent.nano.LauncherLogProto;
@@ -41,6 +42,13 @@ public class BackgroundAppState extends OverviewState { 
        super(id, logContainer, OVERVIEW_TRANSITION_MS, STATE_FLAGS);

    }



    @Override

    public void onStateEnabled(Launcher launcher) {

        RecentsView rv = launcher.getOverviewPanel();

        rv.setOverviewStateEnabled(true);

        AbstractFloatingView.closeAllOpenViews(launcher, false);

    }



    @Override

    public float getVerticalProgress(Launcher launcher) {

        if (launcher.getDeviceProfile().isVerticalBarLayout()) {

src/com/android/launcher3/folder/Folder.java

+4 −0
Original line number Diff line number Diff line
@@ -593,6 +593,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo 
    protected void handleClose(boolean animate) {

        mIsOpen = false;



        if (!animate && mCurrentAnimator != null && mCurrentAnimator.isRunning()) {

            mCurrentAnimator.cancel();

        }



        if (isEditingName()) {

            mFolderName.dispatchBackKey();

        }