Merge "First part of Fixing heads-up notification motion in split shade" into... (74d88a0b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+65 −18

Original line number	Diff line number	Diff line
		@@ -443,6 +443,8 @@ public final class NotificationPanelViewController extends PanelViewController {
		private boolean mQsTouchAboveFalsingThreshold;
		private int mQsFalsingThreshold;

		/** Indicates drag starting height when swiping down or up on heads-up notifications */
		private int mHeadsUpStartHeight;
		private HeadsUpTouchHelper mHeadsUpTouchHelper;
		private boolean mListenForHeadsUp;
		private int mNavigationBarBottomHeight;
		@@ -645,6 +647,8 @@ public final class NotificationPanelViewController extends PanelViewController {

		/** The drag distance required to fully expand the split shade. */
		private int mSplitShadeFullTransitionDistance;
		/** The drag distance required to fully transition scrims. */
		private int mSplitShadeScrimTransitionDistance;

		private final NotificationListContainer mNotificationListContainer;
		private final NotificationStackSizeCalculator mNotificationStackSizeCalculator;
		@@ -1052,6 +1056,8 @@ public final class NotificationPanelViewController extends PanelViewController {
		mLockscreenNotificationQSPadding = mResources.getDimensionPixelSize(
		R.dimen.notification_side_paddings);
		mUdfpsMaxYBurnInOffset = mResources.getDimensionPixelSize(R.dimen.udfps_burn_in_offset_y);
		mSplitShadeScrimTransitionDistance = mResources.getDimensionPixelSize(
		R.dimen.split_shade_scrim_transition_distance);
		}

		private void updateViewControllers(KeyguardStatusView keyguardStatusView,
		@@ -1332,7 +1338,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		mQsSizeChangeAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
		mQsSizeChangeAnimator.addUpdateListener(animation -> {
		requestScrollerTopPaddingUpdate(false /* animate */);
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		int height = (int) mQsSizeChangeAnimator.getAnimatedValue();
		mQs.setHeightOverride(height);
		});
		@@ -2111,7 +2117,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		mMetricsLogger.count(COUNTER_PANEL_OPEN_QS, 1);
		setQsExpandImmediate(true);
		setShowShelfOnly(true);
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();

		// Normally, we start listening when the panel is expanded, but here we need to start
		// earlier so the state is already up to date when dragging down.
		@@ -2323,7 +2329,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		// Reset scroll position and apply that position to the expanded height.
		float height = mQsExpansionHeight;
		setQsExpansion(height);
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		mNotificationStackScrollLayoutController.checkSnoozeLeavebehind();

		// When expanding QS, let's authenticate the user if possible,
		@@ -2339,7 +2345,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		if (changed) {
		mQsExpanded = expanded;
		updateQsState();
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		mFalsingCollector.setQsExpanded(expanded);
		mCentralSurfaces.setQsExpanded(expanded);
		mNotificationsQSContainerController.setQsExpanded(expanded);
		@@ -3063,16 +3069,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		int maxHeight;
		if (mQsExpandImmediate \|\| mQsExpanded \|\| mIsExpanding && mQsExpandedWhenExpandingStarted
		\|\| mPulsing \|\| mSplitShadeEnabled) {
		if (mSplitShadeEnabled && mBarState == SHADE) {
		// Max panel height is used to calculate the fraction of the shade expansion.
		// Traditionally the value is based on the number of notifications.
		// On split-shade, we want the required distance to be a specific and constant
		// value, to make sure the expansion motion has the expected speed.
		// We also only want this on non-lockscreen for now.
		maxHeight = mSplitShadeFullTransitionDistance;
		} else {
		maxHeight = calculatePanelHeightQsExpanded();
		}
		} else {
		maxHeight = calculatePanelHeightShade();
		}
		@@ -3430,6 +3427,31 @@ public final class NotificationPanelViewController extends PanelViewController {
		\|\| !isTracking());
		}

		@Override
		public int getMaxPanelTransitionDistance() {
		// Traditionally the value is based on the number of notifications. On split-shade, we want
		// the required distance to be a specific and constant value, to make sure the expansion
		// motion has the expected speed. We also only want this on non-lockscreen for now.
		if (mSplitShadeEnabled && mBarState == SHADE) {
		boolean transitionFromHeadsUp =
		mHeadsUpManager.isTrackingHeadsUp() \|\| mExpandingFromHeadsUp;
		// heads-up starting height is too close to mSplitShadeFullTransitionDistance and
		// when dragging HUN transition is already 90% complete. It makes shade become
		// immediately visible when starting to drag. We want to set distance so that
		// nothing is immediately visible when dragging (important for HUN swipe up motion) -
		// 0.4 expansion fraction is a good starting point.
		if (transitionFromHeadsUp) {
		double maxDistance = Math.max(mSplitShadeFullTransitionDistance,
		mHeadsUpStartHeight * 2.5);
		return (int) Math.min(getMaxPanelHeight(), maxDistance);
		} else {
		return mSplitShadeFullTransitionDistance;
		}
		} else {
		return getMaxPanelHeight();
		}
		}

		@Override
		protected boolean isTrackingBlocked() {
		return mConflictingQsExpansionGesture && mQsExpanded \|\| mBlockingExpansionForCurrentTouch;
		@@ -3628,11 +3650,36 @@ public final class NotificationPanelViewController extends PanelViewController {
		return mBarState == KEYGUARD;
		}

		/**
		* Called when heads-up notification is being dragged up or down to indicate what's the starting
		* height for shade motion
		*/
		public void setHeadsUpDraggingStartingHeight(int startHeight) {
		mHeadsUpStartHeight = startHeight;
		float scrimMinFraction;
		if (mSplitShadeEnabled) {
		boolean highHun = mHeadsUpStartHeight * 2.5 > mSplitShadeScrimTransitionDistance;
		// if HUN height is higher than 40% of predefined transition distance, it means HUN
		// is too high for regular transition. In that case we need to calculate transition
		// distance - here we take scrim transition distance as equal to shade transition
		// distance. It doesn't result in perfect motion - usually scrim transition distance
		// should be longer - but it's good enough for HUN case.
		float transitionDistance =
		highHun ? getMaxPanelTransitionDistance() : mSplitShadeFullTransitionDistance;
		scrimMinFraction = mHeadsUpStartHeight / transitionDistance;
		} else {
		int transitionDistance = getMaxPanelHeight();
		scrimMinFraction = transitionDistance > 0f
		? (float) mHeadsUpStartHeight / transitionDistance : 0f;
		}
		setPanelScrimMinFraction(scrimMinFraction);
		}

		/**
		* Sets the minimum fraction for the panel expansion offset. This may be non-zero in certain
		* cases, such as if there's a heads-up notification.
		*/
		public void setPanelScrimMinFraction(float minFraction) {
		private void setPanelScrimMinFraction(float minFraction) {
		mMinFraction = minFraction;
		mDepthController.setPanelPullDownMinFraction(mMinFraction);
		mScrimController.setPanelScrimMinFraction(mMinFraction);
		@@ -4364,7 +4411,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		if (mKeyguardShowing) {
		updateMaxDisplayedNotifications(true);
		}
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		}

		@Override
		@@ -4497,7 +4544,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		if (mQsExpanded && mQsFullyExpanded) {
		mQsExpansionHeight = mQsMaxExpansionHeight;
		requestScrollerTopPaddingUpdate(false /* animate */);
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		}
		if (mAccessibilityManager.isEnabled()) {
		mView.setAccessibilityPaneTitle(determineAccessibilityPaneTitle());
		@@ -4766,7 +4813,7 @@ public final class NotificationPanelViewController extends PanelViewController {
		if (mQsExpanded && mQsFullyExpanded) {
		mQsExpansionHeight = mQsMaxExpansionHeight;
		requestScrollerTopPaddingUpdate(false /* animate */);
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();

		// Size has changed, start an animation.
		if (mQsMaxExpansionHeight != oldMaxHeight) {

packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java

+14 −10

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ public abstract class PanelViewController {
		keyguardStateController.addCallback(new KeyguardStateController.Callback() {
		@Override
		public void onKeyguardFadingAwayChanged() {
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		}
		});
		mAmbientState = ambientState;
		@@ -730,7 +730,7 @@ public abstract class PanelViewController {
		setExpandedHeightInternal(height);
		}

		protected void requestPanelHeightUpdate() {
		void updateExpandedHeightToMaxHeight() {
		float currentMaxPanelHeight = getMaxPanelHeight();

		if (isFullyCollapsed()) {
		@@ -753,6 +753,13 @@ public abstract class PanelViewController {
		setExpandedHeight(currentMaxPanelHeight);
		}

		/**
		* Returns drag down distance after which panel should be fully expanded. Usually it's the
		* same as max panel height but for large screen devices (especially split shade) we might
		* want to return different value to shorten drag distance
		*/
		public abstract int getMaxPanelTransitionDistance();

		public void setExpandedHeightInternal(float h) {
		if (isNaN(h)) {
		Log.wtf(TAG, "ExpandedHeight set to NaN");
		@@ -763,18 +770,15 @@ public abstract class PanelViewController {
		() -> mLatencyTracker.onActionEnd(LatencyTracker.ACTION_EXPAND_PANEL));
		mExpandLatencyTracking = false;
		}
		float maxPanelHeight = getMaxPanelHeight();
		float maxPanelHeight = getMaxPanelTransitionDistance();
		if (mHeightAnimator == null) {
		// Split shade has its own overscroll logic
		if (mTracking && !mInSplitShade) {
		float overExpansionPixels = Math.max(0, h - maxPanelHeight);
		setOverExpansionInternal(overExpansionPixels, true /* isFromGesture */);
		}
		mExpandedHeight = Math.min(h, maxPanelHeight);
		} else {
		mExpandedHeight = h;
		}

		mExpandedHeight = Math.min(h, maxPanelHeight);
		// If we are closing the panel and we are almost there due to a slow decelerating
		// interpolator, abort the animation.
		if (mExpandedHeight < 1f && mExpandedHeight != 0f && mClosing) {
		@@ -832,7 +836,7 @@ public abstract class PanelViewController {
		protected abstract int getMaxPanelHeight();

		public void setExpandedFraction(float frac) {
		setExpandedHeight(getMaxPanelHeight() * frac);
		setExpandedHeight(getMaxPanelTransitionDistance() * frac);
		}

		public float getExpandedHeight() {
		@@ -1029,7 +1033,7 @@ public abstract class PanelViewController {
		mHeightAnimator = animator;
		if (animator == null && mPanelUpdateWhenAnimatorEnds) {
		mPanelUpdateWhenAnimatorEnds = false;
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		}
		}

		@@ -1421,7 +1425,7 @@ public abstract class PanelViewController {
		@Override
		public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft,
		int oldTop, int oldRight, int oldBottom) {
		requestPanelHeightUpdate();
		updateExpandedHeightToMaxHeight();
		mHasLayoutedSinceDown = true;
		if (mUpdateFlingOnLayout) {
		abortAnimations();

packages/SystemUI/src/com/android/systemui/shade/transition/ScrimShadeTransitionController.kt

+7 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent
		import com.android.systemui.statusbar.phone.panelstate.PanelState
		import com.android.systemui.statusbar.phone.panelstate.STATE_OPENING
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.statusbar.policy.HeadsUpManager
		import com.android.systemui.util.LargeScreenUtils
		import java.io.PrintWriter
		import javax.inject.Inject
		@@ -28,6 +29,7 @@ constructor(
		private val scrimController: ScrimController,
		@Main private val resources: Resources,
		private val statusBarStateController: SysuiStatusBarStateController,
		private val headsUpManager: HeadsUpManager
		) {

		private var inSplitShade = false
		@@ -84,7 +86,11 @@ constructor(
		}

		private fun canUseCustomFraction(panelState: Int?) =
		inSplitShade && isScreenUnlocked() && panelState == STATE_OPENING
		inSplitShade && isScreenUnlocked() && panelState == STATE_OPENING &&
		// in case of HUN we can't always use predefined distances to manage scrim
		// transition because dragDownPxAmount can start from value bigger than
		// splitShadeScrimTransitionDistance
		!headsUpManager.isTrackingHeadsUp

		private fun isScreenUnlocked() =
		statusBarStateController.currentOrUpcomingState == StatusBarState.SHADE

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -115,9 +115,7 @@ public class HeadsUpTouchHelper implements Gefingerpoken {
		mInitialTouchY = y;
		int startHeight = (int) (mPickedChild.getActualHeight()
		+ mPickedChild.getTranslationY());
		float maxPanelHeight = mPanel.getMaxPanelHeight();
		mPanel.setPanelScrimMinFraction(maxPanelHeight > 0f
		? (float) startHeight / maxPanelHeight : 0f);
		mPanel.setHeadsUpDraggingStartingHeight(startHeight);
		mPanel.startExpandMotion(x, y, true /* startTracking */, startHeight);
		// This call needs to be after the expansion start otherwise we will get a
		// flicker of one frame as it's not expanded yet.

packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ class PanelExpansionStateManager @Inject constructor() {
		"f=$fraction " +
		"expanded=$expanded " +
		"tracking=$tracking " +
		"drawDownPxAmount=$dragDownPxAmount " +
		"dragDownPxAmount=$dragDownPxAmount " +
		"${if (fullyOpened) " fullyOpened" else ""} " +
		if (fullyClosed) " fullyClosed" else ""
		)