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

Commit 7490d3a8 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Remove unused bouncerShowingOverDream from CentralSurfaces. 

Bug: 277764509
Test: compiles
Change-Id: Iabbb4c39de6ed40960ada82f6e89d586e4d398ca
parent 0c3c52b8

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −5
Original line number Diff line number Diff line
@@ -3773,8 +3773,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                    expand = true;

                    mShadeLog.logEndMotionEvent("endMotionEvent: cancel while on keyguard",

                            forceCancel, expand);

                } else if (mCentralSurfaces.isBouncerShowingOverDream()) {

                    expand = false;

                } else {

                    // If we get a cancel, put the shade back to the state it was in when the

                    // gesture started
@@ -5045,10 +5043,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                return false;

            }



            // Do not allow panel expansion if bouncer is scrimmed or showing over a dream,

            // Do not allow panel expansion if bouncer is scrimmed,

            // otherwise user would be able to pull down QS or expand the shade.

            if (mCentralSurfaces.isBouncerShowingScrimmed()

                    || mCentralSurfaces.isBouncerShowingOverDream()) {

            if (mCentralSurfaces.isBouncerShowingScrimmed()) {

                mShadeLog.logMotionEvent(event,

                        "onTouch: ignore touch, bouncer scrimmed or showing over dream");

                return false;

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

+0 −2
Original line number Diff line number Diff line
@@ -309,8 +309,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 


    boolean isBouncerShowingScrimmed();



    boolean isBouncerShowingOverDream();



    void updateNotificationPanelTouchState();



    int getRotation();

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

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ abstract class CentralSurfacesEmptyImpl : CentralSurfaces { 
    override fun clearNotificationEffects() {}

    override fun isBouncerShowing() = false

    override fun isBouncerShowingScrimmed() = false

    override fun isBouncerShowingOverDream() = false

    override fun updateNotificationPanelTouchState() {}

    override fun getRotation() = 0

    override fun setBarStateForTest(state: Int) {}

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

+1 −10
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
     */

    protected int mState; // TODO: remove this. Just use StatusBarStateController

    protected boolean mBouncerShowing;

    private boolean mBouncerShowingOverDream;



    private final PhoneStatusBarPolicy mIconPolicy;
@@ -2462,10 +2461,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
     */

    @Override

    public boolean shouldKeyguardHideImmediately() {

        final boolean isScrimmedBouncer =

                mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;

        final boolean isBouncerOverDream = isBouncerShowingOverDream();

        return (isScrimmedBouncer || isBouncerOverDream);

        return mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;

    }



    private void showBouncerOrLockScreenIfKeyguard() {
@@ -3181,11 +3177,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        return isBouncerShowing() && mStatusBarKeyguardViewManager.primaryBouncerNeedsScrimming();

    }



    @Override

    public boolean isBouncerShowingOverDream() {

        return mBouncerShowingOverDream;

    }



    // End Extra BaseStatusBarMethods.



    boolean isTransientShown() {