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

Commit 0ea61abe authored by Winson Chung's avatar Winson Chung
Browse files

Merging ub-launcher3-qt-dev, build 5642962 

Test: Manual

Bug:122345781 P1 Inflation happens and a binder call during swipe up gesture, that may cause jank
Bug:123900446 P1 App to home animation should zoom into the app icon
Bug:132209249 P1 Gesture bar interferes with Messenger chat heads.
Bug:132815672 P1 -1 to home swipe up gesture
Bug:132886768 P1 Swipe home animation sometimes drops frames
Bug:133009122 P2 Rare flake: dragged launchable to workspace, but the current state is not WORKSPACE; Can't find a launcher object; selector: BySelector [RES='\Qcom.google.android.apps.nexuslauncher:id/apps_view\E']
Bug:133226418 P1 [Gesture Nav] App launch animation has has incorrect origin when launched in Overview
Bug:133508173 P1 App switching is very janky on QT
Bug:133871965 P1 (V35 20190528.00_RC00):Unable to unlock/minimize phone app during ongoing call
Bug:134095068 P1 Shouldn't use seamless rotation in another case
Bug:134166337 P1 3P Launcher Breaks Overview (Standalone)
Bug:134172603 P1 Tracing for lab-only flakes
Bug:134517106 P1 Swipe up to home should fade out scrim
Bug:134532571 P1 Launcher flake: java.lang.AssertionError: http://go/tapl : want to switch from background to overview, but the current state is not BASE_OVERVIEW; Can't find a launcher object; selector: BySelector [RES='\Qcom.google.android.apps.nexuslauncher:id/overview_panel\E']
Bug:134674880 P1 App group name in expanded view is invisible with white wallpaper
Change-Id: I9bca7db0f03bd4c0581ce946646bf5209e8f6c79
parents a3ed49d5 c25d9753

quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+5 −1
Original line number Diff line number Diff line
@@ -121,12 +121,16 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 
        alpha.setDuration(CONTENT_ALPHA_DURATION);

        alpha.setInterpolator(LINEAR);

        anim.play(alpha);

        overview.setFreezeViewVisibility(true);



        ObjectAnimator transY = ObjectAnimator.ofFloat(overview, View.TRANSLATION_Y, trans);

        transY.setInterpolator(AGGRESSIVE_EASE);

        transY.setDuration(CONTENT_TRANSLATION_DURATION);

        anim.play(transY);



        return mLauncher.getStateManager()::reapplyState;

        return () -> {

            overview.setFreezeViewVisibility(false);

            mLauncher.getStateManager().reapplyState();

        };

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+0 −9
Original line number Diff line number Diff line
@@ -204,15 +204,6 @@ public abstract class RecentsUiFactory { 
        }

    }



    /**

     * Clean-up logic that occurs when recents is no longer in use/visible.

     *

     * @param launcher the launcher activity

     */

    public static void resetOverview(Launcher launcher) {

        launcher.<RecentsView>getOverviewPanel().reset();

    }



    /**

     * Recents logic that triggers when launcher state changes or launcher activity stops/resumes.

     *

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+0 −18
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.launcher3.LauncherState; 
import com.android.launcher3.LauncherStateManager.AnimationConfig;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.PropertySetter;

import com.android.quickstep.hints.ProactiveHintsContainer;

import com.android.quickstep.views.ClearAllButton;

import com.android.quickstep.views.LauncherRecentsView;

import com.android.quickstep.views.RecentsView;
@@ -55,14 +54,6 @@ public final class RecentsViewStateController extends 
        if (state.overviewUi) {

            mRecentsView.updateEmptyMessage();

            mRecentsView.resetTaskVisuals();

            mRecentsView.setHintVisibility(1f);

        } else {

            mRecentsView.setHintVisibility(0f);

            ProactiveHintsContainer

                    proactiveHintsContainer = mRecentsView.getProactiveHintsContainer();

            if (proactiveHintsContainer != null) {

                proactiveHintsContainer.removeAllViews();

            }

        }

        setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, state.getVisibleElements(mLauncher));

        mRecentsView.setFullscreenProgress(state.getOverviewFullscreenProgress());
@@ -75,14 +66,6 @@ public final class RecentsViewStateController extends 


        if (!toState.overviewUi) {

            builder.addOnFinishRunnable(mRecentsView::resetTaskVisuals);

            mRecentsView.setHintVisibility(0f);

            builder.addOnFinishRunnable(() -> {

                ProactiveHintsContainer

                        proactiveHintsContainer = mRecentsView.getProactiveHintsContainer();

                if (proactiveHintsContainer != null) {

                    proactiveHintsContainer.removeAllViews();

                }

            });

        }



        if (toState.overviewUi) {
@@ -94,7 +77,6 @@ public final class RecentsViewStateController extends 
            updateAnim.setDuration(config.duration);

            builder.play(updateAnim);

            mRecentsView.updateEmptyMessage();

            builder.addOnFinishRunnable(() -> mRecentsView.setHintVisibility(1f));

        }



        PropertySetter propertySetter = config.getPropertySetter(builder);

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

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import com.android.launcher3.AbstractFloatingView; 
import com.android.launcher3.Launcher;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.LayoutUtils;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;
@@ -45,8 +44,6 @@ public class BackgroundAppState extends OverviewState { 


    @Override

    public void onStateEnabled(Launcher launcher) {

        RecentsView rv = launcher.getOverviewPanel();

        rv.setOverviewStateEnabled(true);

        AbstractFloatingView.closeAllOpenViews(launcher, false);

    }

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

+0 −8
Original line number Diff line number Diff line
@@ -86,17 +86,9 @@ public class OverviewState extends LauncherState { 


    @Override

    public void onStateEnabled(Launcher launcher) {

        RecentsView rv = launcher.getOverviewPanel();

        rv.setOverviewStateEnabled(true);

        AbstractFloatingView.closeAllOpenViews(launcher);

    }



    @Override

    public void onStateDisabled(Launcher launcher) {

        RecentsView rv = launcher.getOverviewPanel();

        rv.setOverviewStateEnabled(false);

    }



    @Override

    public void onStateTransitionEnd(Launcher launcher) {

        launcher.getRotationHelper().setCurrentStateRequest(REQUEST_ROTATE);