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

Commit 3f54fe2c authored Apr 08, 2018 by Lucas Dupin

Animate shade expansion when bouncer

Change-Id: Ia1b303766379cb9d917c8b60ed70730fe3c4f5b4
Fixes: 76228574
Test: Swipe up, hit back
Test: Double tap on notification, hit back
Test: Launch camera, request bouncer, hit back
Test: Repeat for PIN and password

parent d565f049

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -3899,7 +3899,11 @@ public class StatusBar extends SystemUI implements DemoMode,
		}

		public boolean onBackPressed() {
		if (mStatusBarKeyguardViewManager.onBackPressed()) {
		boolean isScrimmedBouncer = mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;
		if (mStatusBarKeyguardViewManager.onBackPressed(isScrimmedBouncer /* hideImmediately */)) {
		if (!isScrimmedBouncer) {
		mNotificationPanel.expandWithoutQs();
		}
		return true;
		}
		if (mNotificationPanel.isQsExpanded()) {

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -512,12 +512,15 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		/**
		* Notifies this manager that the back button has been pressed.
		*
		* @param hideImmediately Hide bouncer when {@code true}, keep it around otherwise.
		* Non-scrimmed bouncers have a special animation tied to the expansion
		* of the notification panel.
		* @return whether the back press has been handled
		*/
		public boolean onBackPressed() {
		public boolean onBackPressed(boolean hideImmediately) {
		if (mBouncer.isShowing()) {
		mStatusBar.endAffordanceLaunch();
		reset(true /* hideBouncerWhenShowing */);
		reset(hideImmediately);
		return true;
		}
		return false;