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

Commit 3c1a1195 authored by Thales Lima's avatar Thales Lima Committed by Android (Google) Code Review
Browse files

Merge "launcher: change default state for RecentsActivity" into sc-v2-dev

parents e6935d89 0cdf92f9

quickstep/src/com/android/quickstep/RecentsActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DU 
import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_DURATION;

import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY;

import static com.android.launcher3.Utilities.createHomeIntent;

import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;

import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;

import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;

import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;
@@ -75,7 +75,6 @@ import com.android.quickstep.util.RecentsAtomicAnimationFactory; 
import com.android.quickstep.util.SplitSelectStateController;

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.system.ActivityOptionsCompat;

import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
@@ -287,7 +286,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        mStateManager = new StateManager<>(this, RecentsState.DEFAULT);

        mStateManager = new StateManager<>(this, RecentsState.BG_LAUNCHER);



        mOldConfig = new Configuration(getResources().getConfiguration());

        initDeviceProfile();

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

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ public class RecentsState implements BaseState<RecentsState> { 
    private static final int FLAG_OVERVIEW_UI = BaseState.getFlag(7);



    public static final RecentsState DEFAULT = new RecentsState(0,

            FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID | FLAG_SCRIM

                    | FLAG_LIVE_TILE | FLAG_OVERVIEW_UI);

            FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID

                    | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_OVERVIEW_UI);

    public static final RecentsState MODAL_TASK = new ModalState(1,

            FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL

                    | FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_OVERVIEW_UI);