Merge "Merge "Add method to cancel StatusBar touch" into oc-mr1-dev am: d180d76305 am: a69bdd0a57" (bb413384) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5153,6 +5153,14 @@ public class StatusBar extends SystemUI implements DemoMode,
	recomputeDisableFlags(true /* animate */);		recomputeDisableFlags(true /* animate */);
	}		}

			public void cancelCurrentTouch() {
			if (mNotificationPanel.isTracking()) {
			mStatusBarWindow.cancelCurrentTouch();
			if (mState == StatusBarState.SHADE) {
			animateCollapsePanels();
			}
			}
			}

	WakefulnessLifecycle.Observer mWakefulnessObserver = new WakefulnessLifecycle.Observer() {		WakefulnessLifecycle.Observer mWakefulnessObserver = new WakefulnessLifecycle.Observer() {
	@Override		@Override