Merge "sysui: refactor for extensibility." (91b43d50) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		private boolean mPanelTracking;
		private boolean mExpandingNotification;
		private boolean mExpandedInThisMotion;
		private boolean mScrollingEnabled;
		protected boolean mScrollingEnabled;
		protected DismissView mDismissView;
		protected EmptyShadeView mEmptyShadeView;
		private boolean mDismissAllInProgress;
		@@ -1182,7 +1182,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		if (!isScrollingEnabled()) {
		return false;
		}
		if (ev.getY() < mQsContainer.getBottom()) {
		if (isInsideQsContainer(ev)) {
		return false;
		}
		mForcedScroll = null;
		@@ -1312,6 +1312,10 @@ public class NotificationStackScrollLayout extends ViewGroup
		return true;
		}

		protected boolean isInsideQsContainer(MotionEvent ev) {
		return ev.getY() < mQsContainer.getBottom();
		}

		private void onOverScrollFling(boolean open, int initialVelocity) {
		if (mOverscrollTopChangedListener != null) {
		mOverscrollTopChangedListener.flingTopOverscroll(initialVelocity, open);