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

Commit 12ca8b94 authored by Andy Wickham's avatar Andy Wickham
Browse files

Fixes ag/10573640 on qt-future-dev branch. 

Original qt-future-dev change was ag/10601877.

The change needed to be in UiFactory, not RecentsUiFactory.

Fixes: 146593239
Test: Installed NexusLauncherDebug on a QD4A build and
tried the repo steps. Also built other launcher variants.

Merged-In: Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a
Change-Id: I802e2b0069a19ca62a08325bb6d0de5275c43c9b
parent d684eddd

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

+0 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 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;
@@ -49,7 +48,6 @@ 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;
@@ -210,12 +208,6 @@ 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

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_COUNT; 
import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;

import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_COUNT;

import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;

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



import android.animation.AnimatorSet;

import android.animation.ValueAnimator;
@@ -58,6 +59,7 @@ import com.android.quickstep.SysUINavigationMode.Mode; 
import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;

import com.android.quickstep.util.RemoteFadeOutAnimationListener;

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

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



import java.io.ByteArrayOutputStream;

import java.io.PrintWriter;
@@ -252,5 +254,9 @@ public class UiFactory extends RecentsUiFactory { 
        return persons == null ? Utilities.EMPTY_PERSON_ARRAY : persons;

    }



    public static void closeSystemWindows() {}

    /** Closes system windows. */

    public static void closeSystemWindows() {

        ActivityManagerWrapper.getInstance()

            .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);

    }

}