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

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

Merge "Animate SplitPlaceholderView when entering split from overview" into sc-v2-dev

parents d3272907 7903758d

quickstep/res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
    <dimen name="overview_grid_side_margin">54dp</dimen>

    <dimen name="overview_grid_row_spacing">42dp</dimen>

    <dimen name="overview_grid_focus_vertical_margin">40dp</dimen>

    <dimen name="split_placeholder_size">110dp</dimen>



    <!-- These speeds are in dp/s -->

    <dimen name="max_task_dismiss_drag_velocity">2.25dp</dimen>

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+3 −5
Original line number Diff line number Diff line
@@ -271,12 +271,10 @@ public abstract class BaseQuickstepLauncher extends Launcher 


        SysUINavigationMode.INSTANCE.get(this).updateMode();

        mActionsView = findViewById(R.id.overview_actions_view);

        mSplitPlaceholderView = findViewById(R.id.split_placeholder);

        RecentsView overviewPanel = (RecentsView) getOverviewPanel();

        mSplitPlaceholderView.init(

                new SplitSelectStateController(mHandler, SystemUiProxy.INSTANCE.get(this))

        );

        overviewPanel.init(mActionsView, mSplitPlaceholderView);

        SplitSelectStateController controller =

                new SplitSelectStateController(mHandler, SystemUiProxy.INSTANCE.get(this));

        overviewPanel.init(mActionsView, controller);

        mActionsView.setDp(getDeviceProfile());

        mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));

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

+0 −7
Original line number Diff line number Diff line
@@ -18,13 +18,11 @@ package com.android.launcher3.uioverrides; 
import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;

import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;

import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;

import static com.android.launcher3.LauncherState.SPLIT_PLACHOLDER_VIEW;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE;

import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;

import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;

import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;

import static com.android.quickstep.views.SplitPlaceholderView.ALPHA_FLOAT;

import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL;



import android.annotation.TargetApi;
@@ -110,11 +108,6 @@ public final class RecentsViewStateController extends 
        propertySetter.setFloat(mLauncher.getActionsView().getVisibilityAlpha(),

                MultiValueAlpha.VALUE, overviewButtonAlpha, config.getInterpolator(

                        ANIM_OVERVIEW_ACTIONS_FADE, LINEAR));



        float splitPlaceholderAlpha = state.areElementsVisible(mLauncher, SPLIT_PLACHOLDER_VIEW) ?

                0.85f : 0;

        propertySetter.setFloat(mRecentsView.getSplitPlaceholder(), ALPHA_FLOAT,

                splitPlaceholderAlpha, LINEAR);

    }



    @Override

quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class SplitScreenSelectState extends OverviewState { 
    @Override

    public float getSplitSelectTranslation(Launcher launcher) {

        RecentsView recentsView = launcher.getOverviewPanel();

        int splitPosition = recentsView.getSplitPlaceholder().getSplitController()

        int splitPosition = recentsView.getSplitPlaceholder()

                .getActiveSplitPositionOption().mStagePosition;

        if (!recentsView.shouldShiftThumbnailsForSplitSelect(splitPosition)) {

            return 0f;

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
        if (goingUp) {

            currentInterpolator = Interpolators.LINEAR;

            pa = mRecentsView.createTaskDismissAnimation(mTaskBeingDragged,

                    true /* animateTaskView */, true /* removeTask */, maxDuration);

                    true /* animateTaskView */, true /* removeTask */, maxDuration,

                    false /* dismissingForSplitSelection*/);



            mEndDisplacement = -secondaryTaskDimension;

        } else {