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

Commit 5b144ea3 authored by zakcohen's avatar zakcohen Committed by Zak Cohen
Browse files

Overview - leave modal state on orientation changes. 

Bug: 194424293
Test: Local

Change-Id: I913dd5cb85aa1c52d79a8876a78a677a586da9c7
parent 61eb1fe0

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

+11 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.animation.AnimatorSet; 
import android.annotation.TargetApi;

import android.app.ActivityManager.RunningTaskInfo;

import android.content.Context;

import android.content.res.Configuration;

import android.os.Build;

import android.util.AttributeSet;

import android.view.MotionEvent;
@@ -36,11 +37,10 @@ import com.android.launcher3.statemanager.StateManager.StateListener; 
import com.android.quickstep.FallbackActivityInterface;

import com.android.quickstep.GestureState;

import com.android.quickstep.RecentsActivity;

import com.android.quickstep.util.TaskViewSimulator;

import com.android.quickstep.util.SplitSelectStateController;

import com.android.quickstep.util.TaskViewSimulator;

import com.android.quickstep.views.OverviewActionsView;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.SplitPlaceholderView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.recents.model.Task.TaskKey;
@@ -184,6 +184,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta 
        } else {

            if (mActivity.isInState(RecentsState.MODAL_TASK)) {

                mActivity.getStateManager().goToState(DEFAULT);

                resetModalVisuals();

            }

        }

    }
@@ -221,4 +222,12 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta 
        // Do not let touch escape to siblings below this view.

        return result || mActivity.getStateManager().getState().overviewUi();

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);



        // Reset modal state if full configuration changes

        setModalStateEnabled(false);

    }

}

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+2 −4
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun 
        } else {

            if (mActivity.isInState(LauncherState.OVERVIEW_MODAL_TASK)) {

                mActivity.getStateManager().goToState(LauncherState.OVERVIEW);

                resetModalVisuals();

            }

        }

    }
@@ -254,9 +255,6 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun 
        super.onConfigurationChanged(newConfig);

        // If overview is in modal state when rotate, reset it to overview state without running

        // animation.

        if (mActivity.isInState(OVERVIEW_MODAL_TASK)) {

            mActivity.getStateManager().goToState(LauncherState.OVERVIEW, false);

            resetModalVisuals();

        }

        setModalStateEnabled(false);

    }

}

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −0
Original line number Diff line number Diff line
@@ -1383,6 +1383,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                || !mOrientationHandler.equals(oldOrientationHandler)) {

            // Changed orientations, update controllers so they intercept accordingly.

            mActivity.getDragLayer().recreateControllers();

            setModalStateEnabled(false);

        }



        boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0