Merge "Remove nsslFalsingFix flag" into main (14827a1e) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -170,16 +170,6 @@ flag {
		}
		}

		flag {
		name: "nssl_falsing_fix"
		namespace: "systemui"
		description: "Minor touch changes to prevent falsing errors in NSSL"
		bug: "316551193"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "refactor_get_current_user"
		namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ import androidx.annotation.FloatRange
		import androidx.annotation.VisibleForTesting
		import com.android.systemui.Dumpable
		import com.android.systemui.ExpandHelper
		import com.android.systemui.Flags.nsslFalsingFix
		import com.android.systemui.Gefingerpoken
		import com.android.systemui.biometrics.UdfpsKeyguardViewControllerLegacy
		import com.android.systemui.classifier.Classifier
		@@ -884,9 +883,7 @@ class DragDownHelper(
		isDraggingDown = false
		isTrackpadReverseScroll = false
		shadeRepository.setLegacyLockscreenShadeTracking(false)
		if (nsslFalsingFix() \|\| MigrateClocksToBlueprint.isEnabled) {
		return true
		}
		} else {
		stopDragging()
		return false

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

+12 −27

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static com.android.app.animation.Interpolators.STANDARD;
		import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_SCROLL_FLING;
		import static com.android.server.notification.Flags.screenshareNotificationHiding;
		import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;
		import static com.android.systemui.Flags.nsslFalsingFix;
		import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;
		import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.OnEmptySpaceClickListener;
		import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.OnOverscrollTopChangedListener;
		@@ -2062,8 +2061,7 @@ public class NotificationStackScrollLayoutController implements Dumpable {
		}
		boolean horizontalSwipeWantsIt = false;
		boolean scrollerWantsIt = false;
		if (nsslFalsingFix() \|\| MigrateClocksToBlueprint.isEnabled()) {
		// Reverse the order relative to the else statement. onScrollTouch will reset on an
		// NOTE: the order of these is important. If reversed, onScrollTouch will reset on an
		// UP event, causing horizontalSwipeWantsIt to be set to true on vertical swipes.
		if (mLongPressedView == null && !mView.isBeingDragged()
		&& !expandingNotification
		@@ -2076,19 +2074,6 @@ public class NotificationStackScrollLayoutController implements Dumpable {
		&& !expandingNotification && !mView.getDisallowScrollingInThisMotion()) {
		scrollerWantsIt = mView.onScrollTouch(ev);
		}
		} else {
		if (mLongPressedView == null && mView.isExpanded() && !mSwipeHelper.isSwiping()
		&& !expandingNotification && !mView.getDisallowScrollingInThisMotion()) {
		scrollerWantsIt = mView.onScrollTouch(ev);
		}
		if (mLongPressedView == null && !mView.isBeingDragged()
		&& !expandingNotification
		&& !mView.getExpandedInThisMotion()
		&& !onlyScrollingInThisMotion
		&& !mView.getDisallowDismissInThisMotion()) {
		horizontalSwipeWantsIt = mSwipeHelper.onTouchEvent(ev);
		}
		}

		// Check if we need to clear any snooze leavebehinds
		if (guts != null && !NotificationSwipeHelper.isTouchInView(ev, guts)