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

Commit 84993542 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Hide back button on bouncer as user swipes down 

Test: atest KeyguardBouncerTest
Test: go/sysui-bouncer-tests
Change-Id: I3d0fa71896be1dbe0cb433bf3bd6eecdc64e299a
Fixes: 110852045
parent a7998431

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

+3 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ public class KeyguardBouncer { 
        } else if (fraction == EXPANSION_HIDDEN && oldExpansion != EXPANSION_HIDDEN) {

            onFullyHidden();

            mExpansionCallback.onFullyHidden();

        } else if (fraction != EXPANSION_VISIBLE && oldExpansion == EXPANSION_VISIBLE) {

            mExpansionCallback.onStartingToHide();

        }

    }
@@ -481,6 +483,7 @@ public class KeyguardBouncer { 


    public interface BouncerExpansionCallback {

        void onFullyShown();

        void onStartingToHide();

        void onFullyHidden();

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            updateStates();

        }



        @Override

        public void onStartingToHide() {

            updateStates();

        }



        @Override

        public void onFullyHidden() {

            updateStates();

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java

+6 −2
Original line number Diff line number Diff line
@@ -170,13 +170,17 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
        mBouncer.ensureView();

        mBouncer.setExpansion(0.5f);



        mBouncer.setExpansion(1);

        mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);

        verify(mFalsingManager).onBouncerHidden();

        verify(mExpansionCallback).onFullyHidden();



        mBouncer.setExpansion(0);

        mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

        verify(mFalsingManager).onBouncerShown();

        verify(mExpansionCallback).onFullyShown();



        verify(mExpansionCallback, never()).onStartingToHide();

        mBouncer.setExpansion(0.9f);

        verify(mExpansionCallback).onStartingToHide();

    }



    @Test