Merge "Use panel tracking as signal preventing auto-collapse." into klp-dev (f01f1e9b) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -644,6 +644,10 @@ public class PanelView extends FrameLayout {
		return mClosing;
		}

		public boolean isTracking() {
		return mTracking;
		}

		public void setBar(PanelBar panelBar) {
		mBar = panelBar;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -935,7 +935,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		}

		if (CLOSE_PANEL_WHEN_EMPTIED && mNotificationData.size() == 0
		&& !mStatusBarWindow.isPointerDown()) {
		&& !mNotificationPanel.isTracking()) {
		animateCollapsePanels();
		}
		}

+0 −18

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ public class StatusBarWindowView extends FrameLayout
		private NotificationRowLayout latestItems;
		private NotificationPanelView mNotificationPanel;
		private ScrollView mScrollView;
		private boolean mPointerDown;

		PhoneStatusBar mService;

		@@ -87,7 +86,6 @@ public class StatusBarWindowView extends FrameLayout

		@Override
		public boolean onInterceptTouchEvent(MotionEvent ev) {
		registerPointer(ev);
		boolean intercept = false;
		if (mNotificationPanel.isFullyExpanded() && mScrollView.getVisibility() == View.VISIBLE) {
		intercept = mExpandHelper.onInterceptTouchEvent(ev);
		@@ -133,21 +131,5 @@ public class StatusBarWindowView extends FrameLayout
		mExpandHelper.cancel();
		}
		}

		private void registerPointer(MotionEvent event) {
		switch (event.getAction()) {
		case MotionEvent.ACTION_DOWN:
		mPointerDown = true;
		break;
		case MotionEvent.ACTION_CANCEL:
		case MotionEvent.ACTION_UP:
		mPointerDown = false;
		break;
		}
		}

		public boolean isPointerDown() {
		return mPointerDown;
		}
		}