Merge changes I636dbbc4,Idd0711a7 (30dc0721) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -538,6 +538,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
		- getIntrinsicHeight());
		}
		float viewEnd = viewStart + fullHeight;
		// TODO: fix this check for anchor scrolling.
		if (expandingAnimated && mAmbientState.getScrollY() == 0
		&& !mAmbientState.isOnKeyguard() && !iconState.isLastExpandIcon) {
		// We are expanding animated. Because we switch to a linear interpolation in this case,

+23 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ public class AmbientState {

		private ArrayList<ExpandableView> mDraggedViews = new ArrayList<>();
		private int mScrollY;
		private int mAnchorViewIndex;
		private int mAnchorViewY;
		private boolean mDimmed;
		private ActivatableNotificationView mActivatedChild;
		private float mOverScrollTopAmount;
		@@ -130,6 +132,27 @@ public class AmbientState {
		this.mScrollY = scrollY;
		}

		/**
		* Index of the child view whose Y position on screen is returned by {@link #getAnchorViewY()}.
		* Other views are laid out outwards from this view in both directions.
		*/
		public int getAnchorViewIndex() {
		return mAnchorViewIndex;
		}

		public void setAnchorViewIndex(int anchorViewIndex) {
		mAnchorViewIndex = anchorViewIndex;
		}

		/** Current Y position of the view at {@link #getAnchorViewIndex()}. */
		public int getAnchorViewY() {
		return mAnchorViewY;
		}

		public void setAnchorViewY(int anchorViewY) {
		mAnchorViewY = anchorViewY;
		}

		/** Call when dragging begins. */
		public void onBeginDrag(ExpandableView view) {
		mDraggedViews.add(view);