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

Commit 5864e165 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Remove CentralSurfaces screen pinning methods. 

Instead of having CentralSurfacesCommandQueueCallbacks ->
CentralSurfacesImpl -> NavigationBarController, just have
NavigationBarController listen directly for the screen pinning events.

Bug: 277764509
Test: pin & unpin app with gesture nav -> verify "App pinned" and "App
unpinned" toasts appear
Test: pin & unpin app with 3 button nav -> verify "App pinned" and "App
unpinned" toasts appear
Test: attempt to unpin app -> verify pinning escape toast appear

Change-Id: I8fca0e6fce180c8330d5b782d71ef1a2a916eaa4
parent 6e1fa788

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

+24 −20
Original line number Diff line number Diff line
@@ -287,6 +287,30 @@ public class NavigationBarController implements 
                navigationBar.setNavigationBarLumaSamplingEnabled(enable);

            }

        }



        @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();

            }

        }

    };



    /**
@@ -445,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
@@ -2548,16 +2548,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.

     */