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

Commit 1e6d3fd2 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I8fca0e6f,I7fb46a09 into main 

* changes:
  [CS] Remove CentralSurfaces screen pinning methods.
  Update NavBarController's CommandQueue callbacks to be separate.
parents 592c8541 5864e165

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+43 −40
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.navigationbar; 
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;



import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler.DEBUG_MISSING_GESTURE_TAG;

import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;
@@ -58,7 +57,6 @@ import com.android.systemui.settings.DisplayTracker; 
import com.android.systemui.shared.system.QuickStepContract;

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

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue.Callbacks;

import com.android.systemui.statusbar.phone.AutoHideController;

import com.android.systemui.statusbar.phone.BarTransitions.TransitionMode;

import com.android.systemui.statusbar.phone.LightBarController;
@@ -75,7 +73,6 @@ import javax.inject.Inject; 
/** A controller to handle navigation bars. */

@SysUISingleton

public class NavigationBarController implements

        Callbacks,

        ConfigurationController.ConfigurationListener,

        NavigationModeController.ModeChangedListener,

        Dumpable {
@@ -130,7 +127,7 @@ public class NavigationBarController implements 
        mSecureSettings = secureSettings;

        mDisplayTracker = displayTracker;

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        commandQueue.addCallback(this);

        commandQueue.addCallback(mCommandQueueCallbacks);

        configurationController.addCallback(this);

        mConfigChanges.applyNewConfig(mContext.getResources());

        mNavMode = navigationModeController.addListener(this);
@@ -270,6 +267,7 @@ public class NavigationBarController implements 
        return taskbarEnabled;

    }



    private final CommandQueue.Callbacks mCommandQueueCallbacks = new CommandQueue.Callbacks() {

        @Override

        public void onDisplayRemoved(int displayId) {

            removeNavigationBar(displayId);
@@ -290,6 +288,31 @@ public class NavigationBarController implements 
            }

        }



        @Override

        public void showPinningEnterExitToast(boolean entering) {

            int displayId = mContext.getDisplayId();

            final NavigationBarView navBarView = getNavigationBarView(displayId);

            if (navBarView != null) {

                navBarView.showPinningEnterExitToast(entering);

            } else if (displayId == mDisplayTracker.getDefaultDisplayId()

                    && mTaskbarDelegate.isInitialized()) {

                mTaskbarDelegate.showPinningEnterExitToast(entering);

            }

        }



        @Override

        public void showPinningEscapeToast() {

            int displayId = mContext.getDisplayId();

            final NavigationBarView navBarView = getNavigationBarView(displayId);

            if (navBarView != null) {

                navBarView.showPinningEscapeToast();

            } else if (displayId == mDisplayTracker.getDefaultDisplayId()

                    && mTaskbarDelegate.isInitialized()) {

                mTaskbarDelegate.showPinningEscapeToast();

            }

        }

    };



    /**

     * Recreates the navigation bar for the given display.

     */
@@ -446,26 +469,6 @@ public class NavigationBarController implements 
        return mNavigationBars.get(displayId);

    }



    public void showPinningEnterExitToast(int displayId, boolean entering) {

        final NavigationBarView navBarView = getNavigationBarView(displayId);

        if (navBarView != null) {

            navBarView.showPinningEnterExitToast(entering);

        } else if (displayId == mDisplayTracker.getDefaultDisplayId()

                && mTaskbarDelegate.isInitialized()) {

            mTaskbarDelegate.showPinningEnterExitToast(entering);

        }

    }



    public void showPinningEscapeToast(int displayId) {

        final NavigationBarView navBarView = getNavigationBarView(displayId);

        if (navBarView != null) {

            navBarView.showPinningEscapeToast();

        } else if (displayId == mDisplayTracker.getDefaultDisplayId()

                && mTaskbarDelegate.isInitialized()) {

            mTaskbarDelegate.showPinningEscapeToast();

        }

    }



    public boolean isOverviewEnabled(int displayId) {

        final NavigationBarView navBarView = getNavigationBarView(displayId);

        if (navBarView != null) {

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

+0 −4
Original line number Diff line number Diff line
@@ -265,10 +265,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 


    boolean isOverviewEnabled();



    void showPinningEnterExitToast(boolean entering);



    void showPinningEscapeToast();



    void setBouncerShowing(boolean bouncerShowing);



    boolean isScreenFullyOff();

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

+0 −10
Original line number Diff line number Diff line
@@ -509,16 +509,6 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba 
        mAssistManager.showDisclosure();

    }



    @Override

    public void showPinningEnterExitToast(boolean entering) {

        mCentralSurfaces.showPinningEnterExitToast(entering);

    }



    @Override

    public void showPinningEscapeToast() {

        mCentralSurfaces.showPinningEscapeToast();

    }



    @Override

    public void showScreenPinningRequest(int taskId) {

        if (mKeyguardStateController.isShowing()) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesEmptyImpl.kt

+0 −2
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ abstract class CentralSurfacesEmptyImpl : CentralSurfaces { 
    ) {}

    override fun getNavigationBarView(): NavigationBarView? = null

    override fun isOverviewEnabled() = false

    override fun showPinningEnterExitToast(entering: Boolean) {}

    override fun showPinningEscapeToast() {}

    override fun setBouncerShowing(bouncerShowing: Boolean) {}

    override fun isScreenFullyOff() = false

    override fun showScreenPinningRequest(taskId: Int, allowCancel: Boolean) {}

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

+0 −10
Original line number Diff line number Diff line
@@ -2546,16 +2546,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        return mNavigationBarController.isOverviewEnabled(mDisplayId);

    }



    @Override

    public void showPinningEnterExitToast(boolean entering) {

        mNavigationBarController.showPinningEnterExitToast(mDisplayId, entering);

    }



    @Override

    public void showPinningEscapeToast() {

        mNavigationBarController.showPinningEscapeToast(mDisplayId);

    }



    /**

     * Propagation of the bouncer state, indicating that it's fully visible.

     */