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

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

Merge "Revert to overview coming from the side instead of bottom" into sc-dev

parents f0e11cbb 82d5a068

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

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY 
import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.app.ActivityOptions;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.IntentSender;

import android.content.ComponentName;

import android.content.ServiceConnection;

import android.os.Bundle;

import android.os.CancellationSignal;
@@ -388,7 +388,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 
    @Override

    public float[] getNormalOverviewScaleAndOffset() {

        return SysUINavigationMode.getMode(this).hasGestures

                ? new float[] {1, NO_OFFSET, 1} : new float[] {1.1f, NO_OFFSET, NO_OFFSET};

                ? new float[] {1, 1} : new float[] {1.1f, NO_OFFSET};

    }



    @Override

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

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR 
import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;

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

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

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

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

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

import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION;
@@ -65,7 +64,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
        float[] scaleAndOffset = state.getOverviewScaleAndOffset(mLauncher);

        RECENTS_SCALE_PROPERTY.set(mRecentsView, scaleAndOffset[0]);

        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]);

        ADJACENT_PAGE_VERTICAL_OFFSET.set(mRecentsView, scaleAndOffset[2]);

        TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);



        getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
@@ -97,8 +95,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
                config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR));

        setter.setFloat(mRecentsView, ADJACENT_PAGE_HORIZONTAL_OFFSET, scaleAndOffset[1],

                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR));

        setter.setFloat(mRecentsView, ADJACENT_PAGE_VERTICAL_OFFSET, scaleAndOffset[2],

                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));

        setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,

                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));

        PagedOrientationHandler orientationHandler =

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

+1 −1
Original line number Diff line number Diff line
@@ -96,6 +96,6 @@ public class BackgroundAppState extends OverviewState { 
            BaseDraggingActivity activity) {

        return new float[] {

                ((RecentsView) activity.getOverviewPanel()).getMaxScaleForFullScreen(),

                NO_OFFSET, NO_OFFSET};

                NO_OFFSET};

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -78,6 +78,6 @@ public class OverviewModalTaskState extends OverviewState { 
        float scale = Math.min((float) modalTaskSize.height() / taskSize.y,

                (float) modalTaskSize.width() / taskSize.x);



        return new float[] {scale, NO_OFFSET, NO_OFFSET};

        return new float[] {scale, NO_OFFSET};

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class OverviewState extends LauncherState { 


    @Override

    public int getTransitionDuration(Context context) {

        // In gesture modes, overview comes in all the way from the bottom, so give it more time.

        // In gesture modes, overview comes in all the way from the side, so give it more time.

        return SysUINavigationMode.INSTANCE.get(context).getMode().hasGestures ? 380 : 250;

    }
@@ -78,7 +78,7 @@ public class OverviewState extends LauncherState { 


    @Override

    public float[] getOverviewScaleAndOffset(Launcher launcher) {

        return new float[] {NO_SCALE, NO_OFFSET, NO_OFFSET};

        return new float[] {NO_SCALE, NO_OFFSET};

    }



    @Override