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

Commit 68a4da89 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Close all open views for 1P and 3P launchers" into tm-qpr-dev am: 6b05c8ce 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18916005



Change-Id: Idb753ff0e5600d5c97ef41ceaf215b06e229b3d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef1b44d2 6b05c8ce

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

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.quickstep.fallback;



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

import static com.android.launcher3.uioverrides.states.BackgroundAppState.getOverviewScaleAndOffsetForBackgroundState;

import static com.android.launcher3.uioverrides.states.OverviewModalTaskState.getOverviewScaleAndOffsetForModalState;
@@ -52,7 +53,7 @@ public class RecentsState implements BaseState<RecentsState> { 
    public static final RecentsState HOME = new RecentsState(3, 0);

    public static final RecentsState BG_LAUNCHER = new LauncherState(4, 0);

    public static final RecentsState OVERVIEW_SPLIT_SELECT = new RecentsState(5,

            FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_OVERVIEW_UI);

            FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_OVERVIEW_UI | FLAG_CLOSE_POPUPS);



    public final int ordinal;

    private final int mFlags;

src/com/android/launcher3/Launcher.java

+0 −4
Original line number Diff line number Diff line
@@ -1080,10 +1080,6 @@ public class Launcher extends StatefulActivity<LauncherState> 
        }

        addActivityFlags(ACTIVITY_STATE_TRANSITION_ACTIVE);



        if (state.hasFlag(FLAG_CLOSE_POPUPS)) {

            AbstractFloatingView.closeAllOpenViews(this, !state.hasFlag(FLAG_NON_INTERACTIVE));

        }



        if (state == SPRING_LOADED) {

            // Prevent any Un/InstallShortcutReceivers from updating the db while we are

            // not on homescreen

src/com/android/launcher3/statemanager/StatefulActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.statemanager;



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

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



import android.os.Handler;
@@ -23,6 +24,7 @@ import android.view.View; 


import androidx.annotation.CallSuper;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.LauncherRootView;

import com.android.launcher3.Utilities;
@@ -87,6 +89,10 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>> 
        if (mDeferredResumePending) {

            handleDeferredResume();

        }



        if (state.hasFlag(FLAG_CLOSE_POPUPS)) {

            AbstractFloatingView.closeAllOpenViews(this, !state.hasFlag(FLAG_NON_INTERACTIVE));

        }

    }



    /**