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

Commit 150805f9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6285821 from d5cafac5 to qt-qpr3-release 

Change-Id: Iacab69ab09c01f865196e369fc0cab83ed3d2c20
parents 3bc7aaec d5cafac5

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.launcher3.uioverrides; 
import static com.android.launcher3.LauncherState.NORMAL;

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

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;



import android.content.Context;

import android.graphics.Rect;
@@ -48,6 +49,7 @@ import com.android.quickstep.SysUINavigationMode; 
import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.TouchInteractionService;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.WindowManagerWrapper;



import java.util.ArrayList;
@@ -208,6 +210,12 @@ public abstract class RecentsUiFactory { 
        }

    }



    /** Closes system windows. */

    public static void closeSystemWindows() {

        ActivityManagerWrapper.getInstance()

            .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);

    }



    private static final class LauncherTaskViewController extends

            TaskViewTouchController<Launcher> {

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

+2 −0
Original line number Diff line number Diff line
@@ -251,4 +251,6 @@ public class UiFactory extends RecentsUiFactory { 
        Person[] persons = si.getPersons();

        return persons == null ? Utilities.EMPTY_PERSON_ARRAY : persons;

    }



    public static void closeSystemWindows() {}

}

src/com/android/launcher3/Launcher.java

+1 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 
            if (!internalStateHandled) {

                // In all these cases, only animate if we're already on home

                AbstractFloatingView.closeAllOpenViews(this, isStarted());

                UiFactory.closeSystemWindows();



                if (!isInState(NORMAL)) {

                    // Only change state, if not already the same. This prevents cancelling any

src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java

+2 −0
Original line number Diff line number Diff line
@@ -101,4 +101,6 @@ public class UiFactory { 
    public static Person[] getPersons(ShortcutInfo si) {

        return Utilities.EMPTY_PERSON_ARRAY;

    }



    public static void closeSystemWindows() {}

}