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

Commit 0ba00953 authored May 09, 2019 by Lucas Dupin Committed by Android (Google) Code Review May 09, 2019

Merge "Revert LockIcon click behavior" into qt-dev

parents 2e761ef0 d54f00e3

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -198,7 +198,7 @@ public class KeyguardIndicationController implements StateListener,
	if (!mAccessibilityController.isAccessibilityEnabled()) {		if (!mAccessibilityController.isAccessibilityEnabled()) {
	return;		return;
	}		}
	mShadeController.showBouncer(false /* scrimmed */);		mShadeController.animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
	}		}

	/**		/**

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,12 @@ public interface ShadeController {
	*/		*/
	void instantExpandNotificationsPanel();		void instantExpandNotificationsPanel();

			/**
			* Collapse the shade animated, showing the bouncer when on {@link StatusBarState#KEYGUARD} or
			* dismissing {@link StatusBar} when on {@link StatusBarState#SHADE}.
			*/
			void animateCollapsePanels(int flags, boolean force);

	/**		/**
	* If the notifications panel is not fully expanded, collapse it animated.		* If the notifications panel is not fully expanded, collapse it animated.
	*		*

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

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3297,12 +3297,8 @@ public class StatusBar extends SystemUI implements DemoMode,

	@Override		@Override
	public void showBouncer(boolean scrimmed) {		public void showBouncer(boolean scrimmed) {
	if (!mIsOccluded && !scrimmed && mState == StatusBarState.KEYGUARD) {
	animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
	} else {
	mStatusBarKeyguardViewManager.showBouncer(scrimmed);		mStatusBarKeyguardViewManager.showBouncer(scrimmed);
	}		}
	}

	@Override		@Override
	public void instantExpandNotificationsPanel() {		public void instantExpandNotificationsPanel() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -257,7 +257,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {

	when(mAccessibilityController.isAccessibilityEnabled()).thenReturn(true);		when(mAccessibilityController.isAccessibilityEnabled()).thenReturn(true);
	clickCaptor.getValue().onClick(mLockIcon);		clickCaptor.getValue().onClick(mLockIcon);
	verify(mShadeController).showBouncer(eq(false));		verify(mShadeController).animateCollapsePanels(anyInt(), eq(true));

	longClickCaptor.getValue().onLongClick(mLockIcon);		longClickCaptor.getValue().onLongClick(mLockIcon);
	verify(mLockPatternUtils).requireCredentialEntry(anyInt());		verify(mLockPatternUtils).requireCredentialEntry(anyInt());