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

Commit ae3b432a authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove Recents from components. 

Bug: 143972303
Test: atest SystemUITests && manual
Change-Id: If430d99b2a8b8721cc3ec753a85685d2485fa16b
parent f8a28911

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -28,7 +28,10 @@ import com.android.systemui.dock.DockManager; 
import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.car.CarStatusBar;

import com.android.systemui.statusbar.car.CarStatusBar;
@@ -102,6 +105,13 @@ abstract class CarSystemUIModule { 
        return SysUiServiceProvider.getComponent(context, StatusBar.class);

        return SysUiServiceProvider.getComponent(context, StatusBar.class);

    }

    }





    @Provides

    @Singleton

    static Recents provideRecents(Context context, RecentsImplementation recentsImplementation,

            CommandQueue commandQueue) {

        return new Recents(context, recentsImplementation, commandQueue);

    }



    @Binds

    @Binds

    abstract SystemUIRootComponent bindSystemUIRootComponent(

    abstract SystemUIRootComponent bindSystemUIRootComponent(

            CarSystemUIRootComponent systemUIRootComponent);

            CarSystemUIRootComponent systemUIRootComponent);

packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -27,7 +27,10 @@ import com.android.systemui.dock.DockManager; 
import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.notification.collection.NotificationData;

import com.android.systemui.statusbar.notification.collection.NotificationData;
@@ -86,4 +89,11 @@ abstract class SystemUIDefaultModule { 
    static Divider provideDivider(Context context) {

    static Divider provideDivider(Context context) {

        return new Divider(context);

        return new Divider(context);

    }

    }



    @Provides

    @Singleton

    static Recents provideRecents(Context context, RecentsImplementation recentsImplementation,

            CommandQueue commandQueue) {

        return new Recents(context, recentsImplementation, commandQueue);

    }

}
 
}

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.systemui.DumpController; 
import com.android.systemui.assist.AssistModule;

import com.android.systemui.assist.AssistModule;

import com.android.systemui.model.SysUiState;

import com.android.systemui.model.SysUiState;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.recents.Recents;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.notification.people.PeopleHubModule;

import com.android.systemui.statusbar.notification.people.PeopleHubModule;
@@ -78,6 +79,9 @@ public abstract class SystemUIModule { 
    @BindsOptionalOf

    @BindsOptionalOf

    abstract Divider optionalDivider();

    abstract Divider optionalDivider();





    @BindsOptionalOf

    abstract Recents optionalRecents();



    @BindsOptionalOf

    @BindsOptionalOf

    abstract StatusBar optionalStatusBar();

    abstract StatusBar optionalStatusBar();

}
 
}

packages/SystemUI/src/com/android/systemui/recents/Recents.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -28,19 +28,14 @@ import com.android.systemui.statusbar.CommandQueue; 
import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;





import javax.inject.Inject;

import javax.inject.Singleton;



/**

/**

 * A proxy to a Recents implementation.

 * A proxy to a Recents implementation.

 */

 */

@Singleton

public class Recents extends SystemUI implements CommandQueue.Callbacks {

public class Recents extends SystemUI implements CommandQueue.Callbacks {





    private final RecentsImplementation mImpl;

    private final RecentsImplementation mImpl;

    private final CommandQueue mCommandQueue;

    private final CommandQueue mCommandQueue;





    @Inject

    public Recents(Context context, RecentsImplementation impl, CommandQueue commandQueue) {

    public Recents(Context context, RecentsImplementation impl, CommandQueue commandQueue) {

        super(context);

        super(context);

        mImpl = impl;

        mImpl = impl;
@@ -50,7 +45,6 @@ public class Recents extends SystemUI implements CommandQueue.Callbacks { 
    @Override

    @Override

    public void start() {

    public void start() {

        mCommandQueue.addCallback(this);

        mCommandQueue.addCallback(this);

        putComponent(Recents.class, this);

        mImpl.onStart(mContext, this);

        mImpl.onStart(mContext, this);

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -118,6 +118,7 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.Locale;

import java.util.Optional;

import java.util.function.Consumer;

import java.util.function.Consumer;





import javax.inject.Inject;

import javax.inject.Inject;
@@ -162,8 +163,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
    private int mDisabledFlags1;

    private int mDisabledFlags1;

    private int mDisabledFlags2;

    private int mDisabledFlags2;

    private StatusBar mStatusBar;

    private StatusBar mStatusBar;

    private Recents mRecents;

    private final Divider mDivider;

    private final Divider mDivider;

    private final Optional<Recents> mRecentsOptional;

    private WindowManager mWindowManager;

    private WindowManager mWindowManager;

    private final CommandQueue mCommandQueue;

    private final CommandQueue mCommandQueue;

    private long mLastLockToAppLongPress;

    private long mLastLockToAppLongPress;
@@ -267,7 +268,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
            SysUiState sysUiFlagsContainer,

            SysUiState sysUiFlagsContainer,

            BroadcastDispatcher broadcastDispatcher,

            BroadcastDispatcher broadcastDispatcher,

            CommandQueue commandQueue,

            CommandQueue commandQueue,

            Divider divider) {

            Divider divider,

            Optional<Recents> recentsOptional) {

        mAccessibilityManagerWrapper = accessibilityManagerWrapper;

        mAccessibilityManagerWrapper = accessibilityManagerWrapper;

        mDeviceProvisionedController = deviceProvisionedController;

        mDeviceProvisionedController = deviceProvisionedController;

        mStatusBarStateController = statusBarStateController;

        mStatusBarStateController = statusBarStateController;
@@ -281,6 +283,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        mBroadcastDispatcher = broadcastDispatcher;

        mBroadcastDispatcher = broadcastDispatcher;

        mCommandQueue = commandQueue;

        mCommandQueue = commandQueue;

        mDivider = divider;

        mDivider = divider;

        mRecentsOptional = recentsOptional;

    }

    }





    // ----- Fragment Lifecycle Callbacks -----

    // ----- Fragment Lifecycle Callbacks -----
@@ -290,7 +293,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);

        mCommandQueue.observe(getLifecycle(), this);

        mCommandQueue.observe(getLifecycle(), this);

        mStatusBar = SysUiServiceProvider.getComponent(getContext(), StatusBar.class);

        mStatusBar = SysUiServiceProvider.getComponent(getContext(), StatusBar.class);

        mRecents = SysUiServiceProvider.getComponent(getContext(), Recents.class);

        mWindowManager = getContext().getSystemService(WindowManager.class);

        mWindowManager = getContext().getSystemService(WindowManager.class);

        mAccessibilityManager = getContext().getSystemService(AccessibilityManager.class);

        mAccessibilityManager = getContext().getSystemService(AccessibilityManager.class);

        mContentResolver = getContext().getContentResolver();

        mContentResolver = getContext().getContentResolver();
@@ -906,7 +908,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
    }

    }





    private boolean onLongPressRecents() {

    private boolean onLongPressRecents() {

        if (mRecents == null || !ActivityTaskManager.supportsMultiWindow(getContext())

        if (mRecentsOptional.isPresent() || !ActivityTaskManager.supportsMultiWindow(getContext())

                || !mDivider.getView().getSnapAlgorithm().isSplitScreenFeasible()

                || !mDivider.getView().getSnapAlgorithm().isSplitScreenFeasible()

                || ActivityManager.isLowRamDeviceStatic()

                || ActivityManager.isLowRamDeviceStatic()

                // If we are connected to the overview service, then disable the recents button

                // If we are connected to the overview service, then disable the recents button