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

Commit 6f99da88 authored Apr 09, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Apr 09, 2018

Merge "Animate shade expansion when bouncer" into pi-dev

parents 9e659c79 3f54fe2c

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;