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

Commit ef3b18b1 authored May 06, 2014 by Jorim Jaggi Committed by Android (Google) Code Review May 06, 2014

Merge "Never close Keyguard automatically."

parents a2d106d4 c1cf1aec

packages/Keyguard/res/layout/keyguard_bouncer.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		android:layout_height="match_parent">

		<View android:id="@+id/bouncer_background"
		android:background="#aa000000"
		android:background="#cc000000"
		android:clickable="true"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1675,6 +1675,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		public void animateCollapsePanels(int flags) {
		if (mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED) {
		return;
		}
		if (SPEW) {
		Log.d(TAG, "animateCollapse():"
		+ " mExpandedVisible=" + mExpandedVisible

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,9 @@ public class StatusBarWindowView extends FrameLayout {
		boolean intercept = false;
		if (mNotificationPanel.isFullyExpanded()
		&& mStackScrollLayout.getVisibility() == View.VISIBLE
		&& mService.getBarState() != StatusBarState.KEYGUARD) {
		&& (mService.getBarState() == StatusBarState.SHADE
		\|\| (mService.getBarState() == StatusBarState.SHADE_LOCKED
		&& !mService.isBouncerShowing()))) {
		intercept = mExpandHelper.onInterceptTouchEvent(ev);
		} else if (mNotificationPanel.isFullyExpanded()
		&& mStackScrollLayout.getVisibility() == View.VISIBLE