Merge "Early expand media" into main (6d54b2bc) · Commits · e / os / android_frameworks_base

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

+19 −15

Original line number	Diff line number	Diff line
		@@ -1660,9 +1660,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		mInitialHeightOnTouch = mExpansionHeight;
		mInitialTouchY = event.getY();
		mInitialTouchX = event.getX();
		if (qsComposeFragmentEarlyExpansion() && mQs != null) {
		mQs.setExpanded(true);
		}
		maybeSetEarlyExpansion();
		}
		if (!isFullyCollapsed && !isShadeOrQsHeightAnimationRunning) {
		handleDown(event);
		@@ -1681,9 +1679,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		}
		if (action == MotionEvent.ACTION_CANCEL \|\| action == MotionEvent.ACTION_UP) {
		mConflictingExpansionGesture = false;
		if (qsComposeFragmentEarlyExpansion()) {
		updateQsState();
		}
		maybeResetEarlyExpansion();
		}
		if (action == MotionEvent.ACTION_DOWN && isFullyCollapsed && isExpansionEnabled()) {
		mTwoFingerExpandPossible = true;
		@@ -1752,9 +1748,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		mInitialHeightOnTouch = mExpansionHeight;
		initVelocityTracker();
		trackMovement(event);
		if (qsComposeFragmentEarlyExpansion() && mQs != null) {
		mQs.setExpanded(true);
		}
		maybeSetEarlyExpansion();
		break;

		case MotionEvent.ACTION_POINTER_UP:
		@@ -1792,9 +1786,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		flingQsWithCurrentVelocity(y,
		event.getActionMasked() == MotionEvent.ACTION_CANCEL);
		} else {
		if (qsComposeFragmentEarlyExpansion()) {
		updateQsState();
		}
		maybeResetEarlyExpansion();
		traceQsJank(false,
		event.getActionMasked() == MotionEvent.ACTION_CANCEL);
		}
		@@ -1880,9 +1872,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		mInitialTouchY = y;
		mInitialTouchX = x;
		mNotificationStackScrollLayoutController.cancelLongPress();
		if (qsComposeFragmentEarlyExpansion() && mQs != null) {
		mQs.setExpanded(true);
		}
		maybeSetEarlyExpansion();
		return true;
		} else {
		mShadeLog.logQsTrackingNotStarted(mInitialTouchY, y, h, touchSlop,
		@@ -2063,6 +2053,20 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		(int) ((y - getInitialTouchY()) / displayDensity), (int) (vel / displayDensity));
		}

		private void maybeSetEarlyExpansion() {
		if (QSComposeFragment.isEnabled() && qsComposeFragmentEarlyExpansion() && mQs != null) {
		mQs.setExpanded(true);
		mMediaHierarchyManager.setQsExpanded(true);
		}
		}

		private void maybeResetEarlyExpansion() {
		if (QSComposeFragment.isEnabled() && qsComposeFragmentEarlyExpansion()) {
		updateQsState();
		mMediaHierarchyManager.setQsExpanded(getExpanded());
		}
		}

		@NeverCompile
		@Override
		public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {