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

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

Merge "Moving various orientation related config in RecentsOrientaedState"... 

Merge "Moving various orientation related config in RecentsOrientaedState" into ub-launcher3-rvc-dev
parents cee56f03 b7833f81

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten 
            mAppWindowAnimationHelper.updateHomeBounds(getStackBounds(dp));

        }

        int displayRotation = 0;

        if (mOrientedState != null && !mOrientedState.areMultipleLayoutOrientationsDisabled()) {

        if (mOrientedState != null && mOrientedState.isMultipleOrientationSupportedByDevice()) {

            // TODO(b/150300347): The first recents animation after launcher is started with the

            //  foreground app not in landscape will look funky until that bug is fixed

            displayRotation = mOrientedState.getDisplayRotation();

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity> 
        mTaskAnimationManager = taskAnimationManager;

        mTouchTimeMs = touchTimeMs;

        mContinuingLastGesture = continuingLastGesture;

        mTaskViewSimulator = new TaskViewSimulator(context, LayoutUtils::calculateLauncherTaskSize);

        mTaskViewSimulator = new TaskViewSimulator(

                context, LayoutUtils::calculateLauncherTaskSize, true);



        initAfterSubclassConstructor();

        initStateCallbacks();

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TI 
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.quickstep.GestureState.DEFAULT_STATE;

import static com.android.quickstep.util.RecentsOrientedState.isFixedRotationTransformEnabled;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
@@ -597,7 +598,7 @@ public class TouchInteractionService extends Service implements PluginListener<O 
    }



    private void handleOrientationSetup(InputConsumer baseInputConsumer) {

        if (!FeatureFlags.ENABLE_FIXED_ROTATION_TRANSFORM.get()) {

        if (!isFixedRotationTransformEnabled(this)) {

            return;

        }

        mDeviceState.enableMultipleRegions(baseInputConsumer instanceof OtherActivityInputConsumer);

quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java

+1 −6
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity> { 
    }



    public FallbackRecentsView(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        super(context, attrs, defStyleAttr, false);

    }



    @Override
@@ -195,9 +195,4 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity> { 
        }

        super.applyLoadPlan(tasks);

    }



    @Override

    protected boolean supportsVerticalLandscape() {

        return false;

    }

}

quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ public class AppWindowAnimationHelper { 
            mTmpRectF.set(mTargetRect);

            Utilities.scaleRectFAboutCenter(mTmpRectF, params.mOffsetScale);

            mCurrentRect.set(mRectFEvaluator.evaluate(params.mProgress, mSourceRect, mTmpRectF));

            if (mOrientedState == null || mOrientedState.areMultipleLayoutOrientationsDisabled()) {

            if (mOrientedState == null

                    || !mOrientedState.isMultipleOrientationSupportedByDevice()) {

                mCurrentRect.offset(params.mOffset, 0);

            } else {

                int displayRotation = mOrientedState.getDisplayRotation();