Merge "Fixed the behavior when dragging down on home screen with a hun" into qt-r1-dev (39d9bd01) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -184,4 +184,6 @@ public interface NotificationListContainer extends ExpandableView.OnHeightChange
		default boolean containsView(View v) {
		return true;
		}

		default void setWillExpand(boolean willExpand) {};
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -500,6 +500,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		private boolean mAnimateBottomOnLayout;
		private float mLastSentAppear;
		private float mLastSentExpandedHeight;
		private boolean mWillExpand;

		@Inject
		public NotificationStackScrollLayout(
		@@ -4406,6 +4407,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		mStateAnimator.setShadeExpanded(isExpanded);
		mSwipeHelper.setIsExpanded(isExpanded);
		if (changed) {
		mWillExpand = false;
		if (!mIsExpanded) {
		mGroupManager.collapseAllGroups();
		mExpandHelper.cancelImmediately();
		@@ -5055,7 +5057,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		if (mAnimationsEnabled && (isHeadsUp \|\| mHeadsUpGoingAwayAnimationsAllowed)) {
		mHeadsUpChangeAnimations.add(new Pair<>(row, isHeadsUp));
		mNeedsAnimation = true;
		if (!mIsExpanded && !isHeadsUp) {
		if (!mIsExpanded && !mWillExpand && !isHeadsUp) {
		row.setHeadsUpAnimatingAway(true);
		}
		requestChildrenUpdate();
		@@ -5076,6 +5078,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		requestChildrenUpdate();
		}

		@Override
		public void setWillExpand(boolean willExpand) {
		mWillExpand = willExpand;
		}

		@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
		public void setTrackingHeadsUp(ExpandableNotificationRow row) {
		mTrackingHeadsUp = row != null;

+2 −1

Original line number	Diff line number	Diff line
		@@ -1283,6 +1283,7 @@ public class NotificationPanelView extends PanelView implements
		}
		mExpectingSynthesizedDown = true;
		onTrackingStarted();
		updatePanelExpanded();
		}

		/**
		@@ -2034,7 +2035,7 @@ public class NotificationPanelView extends PanelView implements
		}

		private void updatePanelExpanded() {
		boolean isExpanded = !isFullyCollapsed();
		boolean isExpanded = !isFullyCollapsed() \|\| mExpectingSynthesizedDown;
		if (mPanelExpanded != isExpanded) {
		mHeadsUpManager.setIsPanelExpanded(isExpanded);
		mStatusBar.setPanelExpanded(isExpanded);

+2 −1

Original line number	Diff line number	Diff line
		@@ -1806,6 +1806,8 @@ public class StatusBar extends SystemUI implements DemoMode,
		mVibratorHelper.vibrate(VibrationEffect.EFFECT_TICK);
		}
		mNotificationPanel.expand(true /* animate */);
		((NotificationListContainer) mStackScroller).setWillExpand(true);
		mHeadsUpManager.unpinAll(true /* userUnpinned */);
		mMetricsLogger.count(NotificationPanelView.COUNTER_PANEL_OPEN, 1);
		} else if (!mNotificationPanel.isInSettings() && !mNotificationPanel.isExpanding()){
		mNotificationPanel.flingSettings(0 /* velocity */,
		@@ -1943,7 +1945,6 @@ public class StatusBar extends SystemUI implements DemoMode,

		if (start) {
		mNotificationPanel.startWaitingForOpenPanelGesture();
		setPanelExpanded(true);
		} else {
		mNotificationPanel.stopWaitingForOpenPanelGesture(velocity);
		}