Merge "Remove Clock Migration Flag: 5/N" into main (fdf50981) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt

+0 −12

Original line number	Diff line number	Diff line
		@@ -211,18 +211,6 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
		controller.setDragDownHelper(dragDownHelper)
		}

		@Test
		@DisableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)
		fun testDragDownHelperCalledWhenDraggingDown() =
		testScope.runTest {
		whenever(dragDownHelper.isDraggingDown).thenReturn(true)
		val now = SystemClock.elapsedRealtime()
		val ev = MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 0f, 0f, 0 /* meta */)
		underTest.onTouchEvent(ev)
		verify(dragDownHelper).onTouchEvent(ev)
		ev.recycle()
		}

		@Test
		fun testNoInterceptTouch() =
		testScope.runTest {

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

+32 −65

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import com.android.systemui.flags.FeatureFlagsClassic;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.keyevent.domain.interactor.SysUIKeyEventHandler;
		import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
		import com.android.systemui.keyguard.MigrateClocksToBlueprint;
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;
		import com.android.systemui.keyguard.shared.model.Edge;
		import com.android.systemui.keyguard.shared.model.KeyguardState;
		@@ -367,9 +366,7 @@ public class NotificationShadeWindowViewController implements Dumpable {
		mTouchActive = true;
		mTouchCancelled = false;
		mDownEvent = ev;
		if (MigrateClocksToBlueprint.isEnabled()) {
		mService.userActivity();
		}
		} else if (ev.getActionMasked() == MotionEvent.ACTION_UP
		\|\| ev.getActionMasked() == MotionEvent.ACTION_CANCEL) {
		mTouchActive = false;
		@@ -443,8 +440,7 @@ public class NotificationShadeWindowViewController implements Dumpable {
		float x = ev.getRawX();
		float y = ev.getRawY();
		if (mStatusBarViewController.touchIsWithinView(x, y)) {
		if (!(MigrateClocksToBlueprint.isEnabled()
		&& mPrimaryBouncerInteractor.isBouncerShowing())) {
		if (!mPrimaryBouncerInteractor.isBouncerShowing()) {
		if (mStatusBarWindowStateController.windowIsShowing()) {
		mIsTrackingBarGesture = true;
		return logDownDispatch(ev, "sending touch to status bar",
		@@ -453,7 +449,7 @@ public class NotificationShadeWindowViewController implements Dumpable {
		return logDownDispatch(ev, "hidden or hiding", true);
		}
		} else {
		mShadeLogger.d("NSWVC: bouncer not showing");
		mShadeLogger.d("NSWVC: bouncer showing");
		}
		} else {
		mShadeLogger.d("NSWVC: touch not within view");
		@@ -511,20 +507,17 @@ public class NotificationShadeWindowViewController implements Dumpable {
		&& !bouncerShowing
		&& !mStatusBarStateController.isDozing()) {
		if (mDragDownHelper.isDragDownEnabled()) {
		if (MigrateClocksToBlueprint.isEnabled()) {
		// When on lockscreen, if the touch originates at the top of the screen
		// go directly to QS and not the shade
		// When on lockscreen, if the touch originates at the top of the screen go
		// directly to QS and not the shade
		if (mStatusBarStateController.getState() == KEYGUARD
		&& mQuickSettingsController.shouldQuickSettingsIntercept(
		ev.getX(), ev.getY(), 0)) {
		mShadeLogger.d("NSWVC: QS intercepted");
		return true;
		}
		}

		// This handles drag down over lockscreen
		boolean result = mDragDownHelper.onInterceptTouchEvent(ev);
		if (MigrateClocksToBlueprint.isEnabled()) {
		if (result) {
		mLastInterceptWasDragDownHelper = true;
		if (ev.getAction() == MotionEvent.ACTION_DOWN) {
		@@ -533,13 +526,6 @@ public class NotificationShadeWindowViewController implements Dumpable {
		} else if (didNotificationPanelInterceptEvent(ev)) {
		return true;
		}
		} else {
		if (result) {
		if (ev.getAction() == MotionEvent.ACTION_DOWN) {
		mShadeLogger.d("NSWVC: drag down helper intercepted");
		}
		}
		}
		return result;
		} else {
		// This else handles interactions on the full shade while unlocked
		@@ -547,13 +533,11 @@ public class NotificationShadeWindowViewController implements Dumpable {
		return true;
		}
		}
		} else if (MigrateClocksToBlueprint.isEnabled()) {
		} else if (!bouncerShowing && didNotificationPanelInterceptEvent(ev)) {
		// This final check handles swipes on HUNs and when Pulsing
		if (!bouncerShowing && didNotificationPanelInterceptEvent(ev)) {
		mShadeLogger.d("NSWVC: intercepted for HUN/PULSING");
		return true;
		}
		}
		return false;
		}

		@@ -562,9 +546,6 @@ public class NotificationShadeWindowViewController implements Dumpable {
		MotionEvent cancellation = MotionEvent.obtain(ev);
		cancellation.setAction(MotionEvent.ACTION_CANCEL);
		mStackScrollLayout.onInterceptTouchEvent(cancellation);
		if (!MigrateClocksToBlueprint.isEnabled()) {
		mShadeViewController.handleExternalInterceptTouch(cancellation);
		}
		cancellation.recycle();
		}

		@@ -574,7 +555,6 @@ public class NotificationShadeWindowViewController implements Dumpable {
		if (mStatusBarStateController.isDozing()) {
		handled = !mDozeServiceHost.isPulsing();
		}
		if (MigrateClocksToBlueprint.isEnabled()) {
		if (mLastInterceptWasDragDownHelper && (mDragDownHelper.isDraggingDown())) {
		// we still want to finish our drag down gesture when locking the screen
		handled \|= mDragDownHelper.onTouchEvent(ev) \|\| handled;
		@@ -582,15 +562,6 @@ public class NotificationShadeWindowViewController implements Dumpable {
		if (!handled && mShadeViewController.handleExternalTouch(ev)) {
		return true;
		}
		} else {
		if (mDragDownHelper.isDragDownEnabled()
		\|\| mDragDownHelper.isDraggingDown()) {
		// we still want to finish our drag down gesture when locking the screen
		return mDragDownHelper.onTouchEvent(ev) \|\| handled;
		} else {
		return handled;
		}
		}
		return handled;
		}

		@@ -673,15 +644,13 @@ public class NotificationShadeWindowViewController implements Dumpable {
		}

		private boolean didNotificationPanelInterceptEvent(MotionEvent ev) {
		if (MigrateClocksToBlueprint.isEnabled()) {
		// Since NotificationStackScrollLayout is now a sibling of notification_panel, we need
		// to also ask NotificationPanelViewController directly, in order to process swipe up
		// events originating from notifications
		// Since NotificationStackScrollLayout is now a sibling of notification_panel, we need to
		// also ask NotificationPanelViewController directly, in order to process swipe up events
		// originating from notifications
		if (mShadeViewController.handleExternalInterceptTouch(ev)) {
		mShadeLogger.d("NSWVC: NPVC intercepted");
		return true;
		}
		}

		return false;
		}
		@@ -707,10 +676,8 @@ public class NotificationShadeWindowViewController implements Dumpable {
		if (!SceneContainerFlag.isEnabled()) {
		mAmbientState.setSwipingUp(false);
		}
		if (MigrateClocksToBlueprint.isEnabled()) {
		mDragDownHelper.stopDragging();
		}
		}

		private void setBrightnessMirrorShowingForDepth(boolean showing) {
		mDepthController.setBrightnessMirrorVisible(showing);

packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt

+0 −18

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.view.ViewGroup
		import android.view.WindowInsets
		import androidx.annotation.VisibleForTesting
		import androidx.constraintlayout.widget.ConstraintSet
		import androidx.constraintlayout.widget.ConstraintSet.BOTTOM
		import androidx.constraintlayout.widget.ConstraintSet.END
		import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID
		import androidx.constraintlayout.widget.ConstraintSet.START
		@@ -32,7 +31,6 @@ import com.android.systemui.customization.R as customR
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.fragments.FragmentService
		import com.android.systemui.keyguard.MigrateClocksToBlueprint
		import com.android.systemui.lifecycle.repeatWhenAttached
		import com.android.systemui.navigationbar.NavigationModeController
		import com.android.systemui.plugins.qs.QS
		@@ -275,7 +273,6 @@ constructor(
		constraintSet.clone(mView)
		setKeyguardStatusViewConstraints(constraintSet)
		setQsConstraints(constraintSet)
		setNotificationsConstraints(constraintSet)
		setLargeScreenShadeHeaderConstraints(constraintSet)
		mView.applyConstraints(constraintSet)
		}
		@@ -288,21 +285,6 @@ constructor(
		}
		}

		private fun setNotificationsConstraints(constraintSet: ConstraintSet) {
		if (MigrateClocksToBlueprint.isEnabled) {
		return
		}
		val startConstraintId = if (splitShadeEnabled) R.id.qs_edge_guideline else PARENT_ID
		val nsslId = R.id.notification_stack_scroller
		constraintSet.apply {
		connect(nsslId, START, startConstraintId, START)
		setMargin(nsslId, START, if (splitShadeEnabled) 0 else panelMarginHorizontal)
		setMargin(nsslId, END, panelMarginHorizontal)
		setMargin(nsslId, TOP, topMargin)
		setMargin(nsslId, BOTTOM, notificationsBottomMargin)
		}
		}

		private fun setQsConstraints(constraintSet: ConstraintSet) {
		val endConstraintId = if (splitShadeEnabled) R.id.qs_edge_guideline else PARENT_ID
		constraintSet.apply {

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

+0 −44

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static androidx.constraintlayout.core.widgets.Optimizer.OPTIMIZATION_GRAP
		import android.app.Fragment;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.graphics.Canvas;
		import android.graphics.Rect;
		import android.util.AttributeSet;
		import android.view.MotionEvent;
		@@ -33,13 +32,10 @@ import androidx.constraintlayout.widget.ConstraintLayout;
		import androidx.constraintlayout.widget.ConstraintSet;

		import com.android.systemui.fragments.FragmentHostManager.FragmentListener;
		import com.android.systemui.keyguard.MigrateClocksToBlueprint;
		import com.android.systemui.plugins.qs.QS;
		import com.android.systemui.res.R;
		import com.android.systemui.statusbar.notification.AboveShelfObserver;

		import java.util.ArrayList;
		import java.util.Comparator;
		import java.util.function.Consumer;

		/**
		@@ -50,11 +46,7 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout

		private View mQsFrame;
		private View mStackScroller;
		private View mKeyguardStatusBar;

		private final ArrayList<View> mDrawingOrderedChildren = new ArrayList<>();
		private final ArrayList<View> mLayoutDrawingOrder = new ArrayList<>();
		private final Comparator<View> mIndexComparator = Comparator.comparingInt(this::indexOfChild);
		private Consumer<WindowInsets> mInsetsChangedListener = insets -> {};
		private Consumer<QS> mQSFragmentAttachedListener = qs -> {};
		private QS mQs;
		@@ -80,7 +72,6 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout
		protected void onFinishInflate() {
		super.onFinishInflate();
		mQsFrame = findViewById(R.id.qs_frame);
		mKeyguardStatusBar = findViewById(R.id.keyguard_header);
		}

		void setStackScroller(View stackScroller) {
		@@ -159,47 +150,12 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout
		return insets;
		}

		@Override
		protected void dispatchDraw(Canvas canvas) {
		mDrawingOrderedChildren.clear();
		mLayoutDrawingOrder.clear();
		if (mKeyguardStatusBar.getVisibility() == View.VISIBLE) {
		mDrawingOrderedChildren.add(mKeyguardStatusBar);
		mLayoutDrawingOrder.add(mKeyguardStatusBar);
		}
		if (mQsFrame.getVisibility() == View.VISIBLE) {
		mDrawingOrderedChildren.add(mQsFrame);
		mLayoutDrawingOrder.add(mQsFrame);
		}
		if (mStackScroller.getVisibility() == View.VISIBLE) {
		mDrawingOrderedChildren.add(mStackScroller);
		mLayoutDrawingOrder.add(mStackScroller);
		}

		// Let's now find the order that the view has when drawing regularly by sorting
		mLayoutDrawingOrder.sort(mIndexComparator);
		super.dispatchDraw(canvas);
		}

		@Override
		public boolean dispatchTouchEvent(MotionEvent ev) {
		return TouchLogger.logDispatchTouch("NotificationsQuickSettingsContainer", ev,
		super.dispatchTouchEvent(ev));
		}

		@Override
		protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
		if (MigrateClocksToBlueprint.isEnabled()) {
		return super.drawChild(canvas, child, drawingTime);
		}
		int layoutIndex = mLayoutDrawingOrder.indexOf(child);
		if (layoutIndex >= 0) {
		return super.drawChild(canvas, mDrawingOrderedChildren.get(layoutIndex), drawingTime);
		} else {
		return super.drawChild(canvas, child, drawingTime);
		}
		}

		public void applyConstraints(ConstraintSet constraintSet) {
		constraintSet.applyTo(this);
		}

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.fragments.FragmentHostManager;
		import com.android.systemui.keyguard.MigrateClocksToBlueprint;
		import com.android.systemui.media.controls.domain.pipeline.MediaDataManager;
		import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager;
		import com.android.systemui.plugins.FalsingManager;
		@@ -1828,16 +1827,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		"onQsIntercept: down action, QS partially expanded/collapsed");
		return true;
		}
		// TODO (b/265193930): remove dependency on NPVC
		if (mPanelViewControllerLazy.get().isKeyguardShowing()
		&& shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, 0)) {
		// Dragging down on the lockscreen statusbar should prohibit other interactions
		// immediately, otherwise we'll wait on the touchslop. This is to allow
		// dragging down to expanded quick settings directly on the lockscreen.
		if (!MigrateClocksToBlueprint.isEnabled()) {
		mPanelView.getParent().requestDisallowInterceptTouchEvent(true);
		}
		}
		if (mExpansionAnimator != null) {
		mInitialHeightOnTouch = mExpansionHeight;
		mShadeLog.logMotionEvent(event,
		@@ -1879,9 +1868,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		&& Math.abs(h) > Math.abs(x - mInitialTouchX)
		&& shouldQuickSettingsIntercept(
		mInitialTouchX, mInitialTouchY, h)) {
		if (!MigrateClocksToBlueprint.isEnabled()) {
		mPanelView.getParent().requestDisallowInterceptTouchEvent(true);
		}
		mShadeLog.onQsInterceptMoveQsTrackingEnabled(h);
		setTracking(true);
		traceQsJank(true, false);