[flexiglass] Falsing system changes.
Flexiglass needs to report signals into the Falsing system. This CL
prepares the Falsing system for that. There are several parts:
1. Elimination of no-op methods in the FalsingCollector interface. These
were being invoked by parts of system UI but their implementation was
empty; might as well drop these.
2. Creation of a Dagger mechanism to provide 2 implementations of
FalsingCollector: FalsingCollectorImpl and FalsingCollectorNoOp; the
latter does nothing (except logging so we can compare traffic between
the two). The Dagger provider checks the Flexiglass scence_container
feaeture flag to know which one to provide.
3. A FalsingCollectorActual-qualified second provider was also added.
This is to let systems that are "blessed" and know that they need to
use the actual FalsingCollector, regardless of the Flexiglass flag state.
Bug: 297262816
Test: Manually verified, together with the rest of the CL chain that the
correct signals are being sent to the REAL FalsingCollector at the right
times.
Change-Id: I01777c7f70f06a6cba55bd9bf19f8633a8b619b9
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollector.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollector.java
index 08e1e9a..f77f989 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollector.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollector.java
@@ -29,78 +29,21 @@
void setShowingAod(boolean showingAod);
/** */
- void onNotificationStartDraggingDown();
-
- /** */
- void onNotificationStopDraggingDown();
-
- /** */
- void setNotificationExpanded();
-
- /** */
- void onQsDown();
-
- /** */
boolean shouldEnforceBouncer();
/** */
- void onTrackingStarted(boolean secure);
-
- /** */
- void onTrackingStopped();
-
- /** */
- void onLeftAffordanceOn();
-
- /** */
- void onCameraOn();
-
- /** */
- void onAffordanceSwipingStarted(boolean rightCorner);
-
- /** */
- void onAffordanceSwipingAborted();
-
- /** */
- void onStartExpandingFromPulse();
-
- /** */
- void onExpansionFromPulseStopped();
-
- /** */
void onScreenOnFromTouch();
/** */
boolean isReportingEnabled();
/** */
- void onUnlockHintStarted();
-
- /** */
- void onCameraHintStarted();
-
- /** */
- void onLeftAffordanceHintStarted();
-
- /** */
void onScreenTurningOn();
/** */
void onScreenOff();
/** */
- void onNotificationStopDismissing();
-
- /** */
- void onNotificationDismissed();
-
- /** */
- void onNotificationStartDismissing();
-
- /** */
- void onNotificationDoubleTap(boolean accepted, float dx, float dy);
-
- /** */
void onBouncerShown();
/** */
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorActual.kt b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorActual.kt
new file mode 100644
index 0000000..3eaad1f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorActual.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.classifier
+
+import javax.inject.Qualifier
+
+@Qualifier
+@MustBeDocumented
+@Retention(AnnotationRetention.RUNTIME)
+annotation class FalsingCollectorActual
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorFake.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorFake.java
index f335d1d..c0ee71c 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorFake.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorFake.java
@@ -29,59 +29,11 @@
}
@Override
- public void onNotificationStartDraggingDown() {
- }
-
- @Override
- public void onNotificationStopDraggingDown() {
- }
-
- @Override
- public void setNotificationExpanded() {
- }
-
- @Override
- public void onQsDown() {
- }
-
- @Override
public boolean shouldEnforceBouncer() {
return false;
}
@Override
- public void onTrackingStarted(boolean secure) {
- }
-
- @Override
- public void onTrackingStopped() {
- }
-
- @Override
- public void onLeftAffordanceOn() {
- }
-
- @Override
- public void onCameraOn() {
- }
-
- @Override
- public void onAffordanceSwipingStarted(boolean rightCorner) {
- }
-
- @Override
- public void onAffordanceSwipingAborted() {
- }
-
- @Override
- public void onStartExpandingFromPulse() {
- }
-
- @Override
- public void onExpansionFromPulseStopped() {
- }
-
- @Override
public void onScreenOnFromTouch() {
}
@@ -91,18 +43,6 @@
}
@Override
- public void onUnlockHintStarted() {
- }
-
- @Override
- public void onCameraHintStarted() {
- }
-
- @Override
- public void onLeftAffordanceHintStarted() {
- }
-
- @Override
public void onScreenTurningOn() {
}
@@ -111,22 +51,6 @@
}
@Override
- public void onNotificationStopDismissing() {
- }
-
- @Override
- public void onNotificationDismissed() {
- }
-
- @Override
- public void onNotificationStartDismissing() {
- }
-
- @Override
- public void onNotificationDoubleTap(boolean accepted, float dx, float dy) {
- }
-
- @Override
public void onBouncerShown() {
}
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
index 6a021f6..39c01f7 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
@@ -103,10 +103,6 @@
private final BatteryStateChangeCallback mBatteryListener = new BatteryStateChangeCallback() {
@Override
- public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {
- }
-
- @Override
public void onWirelessChargingChanged(boolean isWirelessCharging) {
if (isWirelessCharging || mDockManager.isDocked()) {
mProximitySensor.pause();
@@ -169,34 +165,21 @@
@Override
public void onSuccessfulUnlock() {
+ logDebug("REAL: onSuccessfulUnlock");
mFalsingManager.onSuccessfulUnlock();
sessionEnd();
}
@Override
public void setShowingAod(boolean showingAod) {
+ logDebug("REAL: setShowingAod(" + showingAod + ")");
mShowingAod = showingAod;
updateSessionActive();
}
- @Override
- public void onNotificationStartDraggingDown() {
- }
-
- @Override
- public void onNotificationStopDraggingDown() {
- }
-
- @Override
- public void setNotificationExpanded() {
- }
-
- @Override
- public void onQsDown() {
- }
-
@VisibleForTesting
void onQsExpansionChanged(Boolean expanded) {
+ logDebug("REAL: onQsExpansionChanged(" + expanded + ")");
if (expanded) {
unregisterSensors();
} else if (mSessionStarted) {
@@ -210,39 +193,8 @@
}
@Override
- public void onTrackingStarted(boolean secure) {
- }
-
- @Override
- public void onTrackingStopped() {
- }
-
- @Override
- public void onLeftAffordanceOn() {
- }
-
- @Override
- public void onCameraOn() {
- }
-
- @Override
- public void onAffordanceSwipingStarted(boolean rightCorner) {
- }
-
- @Override
- public void onAffordanceSwipingAborted() {
- }
-
- @Override
- public void onStartExpandingFromPulse() {
- }
-
- @Override
- public void onExpansionFromPulseStopped() {
- }
-
- @Override
public void onScreenOnFromTouch() {
+ logDebug("REAL: onScreenOnFromTouch");
onScreenTurningOn();
}
@@ -252,52 +204,28 @@
}
@Override
- public void onUnlockHintStarted() {
- }
-
- @Override
- public void onCameraHintStarted() {
- }
-
- @Override
- public void onLeftAffordanceHintStarted() {
- }
-
- @Override
public void onScreenTurningOn() {
+ logDebug("REAL: onScreenTurningOn");
mScreenOn = true;
updateSessionActive();
}
@Override
public void onScreenOff() {
+ logDebug("REAL: onScreenOff");
mScreenOn = false;
updateSessionActive();
}
@Override
- public void onNotificationStopDismissing() {
- }
-
- @Override
- public void onNotificationDismissed() {
- }
-
- @Override
- public void onNotificationStartDismissing() {
- }
-
- @Override
- public void onNotificationDoubleTap(boolean accepted, float dx, float dy) {
- }
-
- @Override
public void onBouncerShown() {
+ logDebug("REAL: onBouncerShown");
unregisterSensors();
}
@Override
public void onBouncerHidden() {
+ logDebug("REAL: onBouncerHidden");
if (mSessionStarted) {
registerSensors();
}
@@ -305,6 +233,7 @@
@Override
public void onTouchEvent(MotionEvent ev) {
+ logDebug("REAL: onTouchEvent(" + ev.getActionMasked() + ")");
if (!mKeyguardStateController.isShowing()) {
avoidGesture();
return;
@@ -334,6 +263,7 @@
@Override
public void onMotionEventComplete() {
+ logDebug("REAL: onMotionEventComplete");
// We must delay processing the completion because of the way Android handles click events.
// It generally delays executing them immediately, instead choosing to give the UI a chance
// to respond to touch events before acknowledging the click. As such, we must also delay,
@@ -350,6 +280,7 @@
@Override
public void avoidGesture() {
+ logDebug("REAL: avoidGesture");
mAvoidGesture = true;
if (mPendingDownEvent != null) {
mPendingDownEvent.recycle();
@@ -359,6 +290,7 @@
@Override
public void cleanup() {
+ logDebug("REAL: cleanup");
unregisterSensors();
mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateCallback);
mStatusBarStateController.removeCallback(mStatusBarStateListener);
@@ -368,11 +300,13 @@
@Override
public void updateFalseConfidence(FalsingClassifier.Result result) {
+ logDebug("REAL: updateFalseConfidence(" + result.isFalse() + ")");
mHistoryTracker.addResults(Collections.singleton(result), mSystemClock.uptimeMillis());
}
@Override
public void onA11yAction() {
+ logDebug("REAL: onA11yAction");
if (mPendingDownEvent != null) {
mPendingDownEvent.recycle();
mPendingDownEvent = null;
@@ -427,17 +361,13 @@
static void logDebug(String msg) {
- logDebug(msg, null);
- }
-
- static void logDebug(String msg, Throwable throwable) {
if (DEBUG) {
- Log.d(TAG, msg, throwable);
+ logDebug(msg);
}
}
private static class ProximityEventImpl implements FalsingManager.ProximityEvent {
- private ThresholdSensorEvent mThresholdSensorEvent;
+ private final ThresholdSensorEvent mThresholdSensorEvent;
ProximityEventImpl(ThresholdSensorEvent thresholdSensorEvent) {
mThresholdSensorEvent = thresholdSensorEvent;
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorNoOp.kt b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorNoOp.kt
new file mode 100644
index 0000000..e5b404f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorNoOp.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.classifier
+
+import android.view.MotionEvent
+import com.android.systemui.classifier.FalsingCollectorImpl.logDebug
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+
+@SysUISingleton
+class FalsingCollectorNoOp @Inject constructor() : FalsingCollector {
+ override fun onSuccessfulUnlock() {
+ logDebug("NOOP: onSuccessfulUnlock")
+ }
+
+ override fun setShowingAod(showingAod: Boolean) {
+ logDebug("NOOP: setShowingAod($showingAod)")
+ }
+
+ override fun shouldEnforceBouncer(): Boolean = false
+
+ override fun onScreenOnFromTouch() {
+ logDebug("NOOP: onScreenOnFromTouch")
+ }
+
+ override fun isReportingEnabled(): Boolean = false
+
+ override fun onScreenTurningOn() {
+ logDebug("NOOP: onScreenTurningOn")
+ }
+
+ override fun onScreenOff() {
+ logDebug("NOOP: onScreenOff")
+ }
+
+ override fun onBouncerShown() {
+ logDebug("NOOP: onBouncerShown")
+ }
+
+ override fun onBouncerHidden() {
+ logDebug("NOOP: onBouncerHidden")
+ }
+
+ override fun onTouchEvent(ev: MotionEvent) {
+ logDebug("NOOP: onTouchEvent(${ev.actionMasked})")
+ }
+
+ override fun onMotionEventComplete() {
+ logDebug("NOOP: onMotionEventComplete")
+ }
+
+ override fun avoidGesture() {
+ logDebug("NOOP: avoidGesture")
+ }
+
+ override fun cleanup() {
+ logDebug("NOOP: cleanup")
+ }
+
+ override fun updateFalseConfidence(result: FalsingClassifier.Result) {
+ logDebug("NOOP: updateFalseConfidence(${result.isFalse})")
+ }
+
+ override fun onA11yAction() {
+ logDebug("NOOP: onA11yAction")
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingModule.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingModule.java
index c7f3b2d..3195d09 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingModule.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingModule.java
@@ -22,19 +22,21 @@
import com.android.systemui.R;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.flags.FeatureFlagsClassic;
+import com.android.systemui.flags.Flags;
import com.android.systemui.statusbar.phone.NotificationTapHelper;
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
+
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Named;
-import dagger.Binds;
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.ElementsIntoSet;
-
/** Dagger Module for Falsing. */
@Module
public interface FalsingModule {
@@ -45,10 +47,20 @@
String DOUBLE_TAP_TIMEOUT_MS = "falsing_double_tap_timeout_ms";
String IS_FOLDABLE_DEVICE = "falsing_foldable_device";
- /** */
- @Binds
+ /** Provides the actual {@link FalsingCollector} if the scene container feature is off. */
+ @Provides
@SysUISingleton
- FalsingCollector bindsFalsingCollector(FalsingCollectorImpl impl);
+ static FalsingCollector providesFalsingCollectorLegacy(
+ FalsingCollectorImpl impl,
+ FalsingCollectorNoOp noOp,
+ FeatureFlagsClassic featureFlags) {
+ return featureFlags.isEnabled(Flags.SCENE_CONTAINER) ? noOp : impl;
+ }
+
+ /** Provides the actual {@link FalsingCollector}. */
+ @Binds
+ @FalsingCollectorActual
+ FalsingCollector bindsFalsingCollectorActual(FalsingCollectorImpl impl);
/** */
@Provides
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/domain/interactor/FalsingInteractor.kt b/packages/SystemUI/src/com/android/systemui/classifier/domain/interactor/FalsingInteractor.kt
new file mode 100644
index 0000000..2e861c3
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/classifier/domain/interactor/FalsingInteractor.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.classifier.domain.interactor
+
+import android.view.MotionEvent
+import com.android.systemui.classifier.FalsingClassifier
+import com.android.systemui.classifier.FalsingCollector
+import com.android.systemui.classifier.FalsingCollectorActual
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+
+/**
+ * Exposes the subset of the [FalsingCollector] API that's required by external callers.
+ *
+ * E.g. methods of [FalsingCollector] that are not exposed by this class don't need to be invoked by
+ * external callers as they're already called by the scene framework.
+ */
+@SysUISingleton
+class FalsingInteractor
+@Inject
+constructor(
+ @FalsingCollectorActual private val collector: FalsingCollector,
+) {
+ /**
+ * Notifies of a [MotionEvent] that passed through the UI.
+ *
+ * Must call [onMotionEventComplete] when done with this event.
+ */
+ fun onTouchEvent(event: MotionEvent) = collector.onTouchEvent(event)
+
+ /**
+ * Notifies that a [MotionEvent] has finished being dispatched through the UI.
+ *
+ * Must be called after each call to [onTouchEvent].
+ */
+ fun onMotionEventComplete() = collector.onMotionEventComplete()
+
+ /**
+ * Instructs the falsing system to ignore the rest of the current input gesture; automatically
+ * resets when another gesture is started (with the next down event).
+ */
+ fun avoidGesture() = collector.avoidGesture()
+
+ /**
+ * Inserts the given [result] into the falsing system, affecting future runs of the classifier
+ * as if this was a result that had organically happened before.
+ */
+ fun updateFalseConfidence(
+ result: FalsingClassifier.Result,
+ ) = collector.updateFalseConfidence(result)
+}
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt
index 398dcf2..38a6a8f 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt
@@ -39,7 +39,6 @@
import com.android.keyguard.KeyguardUpdateMonitorCallback
import com.android.systemui.Dumpable
import com.android.systemui.R
-import com.android.systemui.classifier.FalsingCollector
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.dump.DumpManager
@@ -59,6 +58,11 @@
import com.android.systemui.plugins.FalsingManager
import com.android.systemui.qs.PageIndicator
import com.android.systemui.shared.system.SysUiStatsLog
+import com.android.systemui.shared.system.SysUiStatsLog.SMARTSPACE_CARD_REPORTED
+import com.android.systemui.shared.system.SysUiStatsLog.SMART_SPACE_CARD_REPORTED__CARD_TYPE__UNKNOWN_CARD
+import com.android.systemui.shared.system.SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY as SSPACE_CARD_REPORTED__DREAM_OVERLAY
+import com.android.systemui.shared.system.SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN as SSPACE_CARD_REPORTED__LOCKSCREEN
+import com.android.systemui.shared.system.SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE
import com.android.systemui.statusbar.notification.collection.provider.OnReorderingAllowedListener
import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider
import com.android.systemui.statusbar.policy.ConfigurationController
@@ -100,7 +104,6 @@
@Main executor: DelayableExecutor,
private val mediaManager: MediaDataManager,
configurationController: ConfigurationController,
- falsingCollector: FalsingCollector,
falsingManager: FalsingManager,
dumpManager: DumpManager,
private val logger: MediaUiEventLogger,
@@ -122,6 +125,7 @@
/** Is the player currently visible (at the end of the transformation */
private var playersVisible: Boolean = false
+
/**
* The desired location where we'll be at the end of the transformation. Usually this matches
* the end location, except when we're still waiting on a state update call.
@@ -152,6 +156,7 @@
@VisibleForTesting var mediaCarousel: MediaScrollView
val mediaCarouselScrollHandler: MediaCarouselScrollHandler
val mediaFrame: ViewGroup
+
@VisibleForTesting
lateinit var settingsButton: View
private set
@@ -280,7 +285,6 @@
this::updatePageIndicatorLocation,
this::updateSeekbarListening,
this::closeGuts,
- falsingCollector,
falsingManager,
this::logSmartspaceImpression,
logger
@@ -327,23 +331,18 @@
if (addOrUpdatePlayer(key, oldKey, data, isSsReactivated)) {
// Log card received if a new resumable media card is added
MediaPlayerData.getMediaPlayer(key)?.let {
- /* ktlint-disable max-line-length */
logSmartspaceCardReported(
759, // SMARTSPACE_CARD_RECEIVED
it.mSmartspaceId,
it.mUid,
surfaces =
intArrayOf(
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY
+ SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
+ SSPACE_CARD_REPORTED__LOCKSCREEN,
+ SSPACE_CARD_REPORTED__DREAM_OVERLAY,
),
rank = MediaPlayerData.getMediaPlayerIndex(key)
)
- /* ktlint-disable max-line-length */
}
if (
mediaCarouselScrollHandler.visibleToUser &&
@@ -362,24 +361,20 @@
it.mUid + systemClock.currentTimeMillis().toInt()
)
it.mIsImpressed = false
- /* ktlint-disable max-line-length */
+
logSmartspaceCardReported(
759, // SMARTSPACE_CARD_RECEIVED
it.mSmartspaceId,
it.mUid,
surfaces =
intArrayOf(
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY
+ SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
+ SSPACE_CARD_REPORTED__LOCKSCREEN,
+ SSPACE_CARD_REPORTED__DREAM_OVERLAY,
),
rank = index,
receivedLatencyMillis = receivedSmartspaceCardLatency
)
- /* ktlint-disable max-line-length */
}
}
// If media container area already visible to the user, log impression for
@@ -431,19 +426,16 @@
it.mUid + systemClock.currentTimeMillis().toInt()
)
it.mIsImpressed = false
- /* ktlint-disable max-line-length */
+
logSmartspaceCardReported(
759, // SMARTSPACE_CARD_RECEIVED
it.mSmartspaceId,
it.mUid,
surfaces =
intArrayOf(
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY
+ SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
+ SSPACE_CARD_REPORTED__LOCKSCREEN,
+ SSPACE_CARD_REPORTED__DREAM_OVERLAY,
),
rank = index,
receivedLatencyMillis =
@@ -451,25 +443,20 @@
data.headphoneConnectionTimeMillis)
.toInt()
)
- /* ktlint-disable max-line-length */
}
}
}
addSmartspaceMediaRecommendations(key, data, shouldPrioritize)
MediaPlayerData.getMediaPlayer(key)?.let {
- /* ktlint-disable max-line-length */
logSmartspaceCardReported(
759, // SMARTSPACE_CARD_RECEIVED
it.mSmartspaceId,
it.mUid,
surfaces =
intArrayOf(
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,
- SysUiStatsLog
- .SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY
+ SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,
+ SSPACE_CARD_REPORTED__LOCKSCREEN,
+ SSPACE_CARD_REPORTED__DREAM_OVERLAY,
),
rank = MediaPlayerData.getMediaPlayerIndex(key),
receivedLatencyMillis =
@@ -477,7 +464,6 @@
data.headphoneConnectionTimeMillis)
.toInt()
)
- /* ktlint-disable max-line-length */
}
if (
mediaCarouselScrollHandler.visibleToUser &&
@@ -560,7 +546,10 @@
mediaCarouselScrollHandler.onSettingsButtonUpdated(settings)
settingsButton.setOnClickListener {
logger.logCarouselSettings()
- activityStarter.startActivity(settingsIntent, true /* dismissShade */)
+ activityStarter.startActivity(
+ settingsIntent,
+ /* dismissShade= */ true,
+ )
}
}
@@ -1108,7 +1097,6 @@
}
}
- @JvmOverloads
/**
* Log Smartspace events
*
@@ -1127,6 +1115,7 @@
* between headphone connection to sysUI displays media recommendation card
* @param isSwipeToDismiss whether is to log swipe-to-dismiss event
*/
+ @JvmOverloads
fun logSmartspaceCardReported(
eventId: Int,
instanceId: Int,
@@ -1154,21 +1143,24 @@
val cardinality = mediaContent.getChildCount()
surfaces.forEach { surface ->
- /* ktlint-disable max-line-length */
SysUiStatsLog.write(
- SysUiStatsLog.SMARTSPACE_CARD_REPORTED,
+ SMARTSPACE_CARD_REPORTED,
eventId,
instanceId,
// Deprecated, replaced with AiAi feature type so we don't need to create logging
// card type for each new feature.
- SysUiStatsLog.SMART_SPACE_CARD_REPORTED__CARD_TYPE__UNKNOWN_CARD,
+ SMART_SPACE_CARD_REPORTED__CARD_TYPE__UNKNOWN_CARD,
surface,
// Use -1 as rank value to indicate user swipe to dismiss the card
if (isSwipeToDismiss) -1 else rank,
cardinality,
- if (mediaControlKey.isSsMediaRec) 15 // MEDIA_RECOMMENDATION
- else if (mediaControlKey.isSsReactivated) 43 // MEDIA_RESUME_SS_ACTIVATED
- else 31, // MEDIA_RESUME
+ if (mediaControlKey.isSsMediaRec) {
+ 15 // MEDIA_RECOMMENDATION
+ } else if (mediaControlKey.isSsReactivated) {
+ 43 // MEDIA_RESUME_SS_ACTIVATED
+ } else {
+ 31
+ }, // MEDIA_RESUME
uid,
interactedSubcardRank,
interactedSubcardCardinality,
@@ -1176,7 +1168,7 @@
null, // Media cards cannot have subcards.
null // Media cards don't have dimensions today.
)
- /* ktlint-disable max-line-length */
+
if (DEBUG) {
Log.d(
TAG,
@@ -1259,6 +1251,7 @@
instanceId = InstanceId.fakeInstanceId(-1),
appUid = -1
)
+
// Whether should prioritize Smartspace card.
internal var shouldPrioritizeSs: Boolean = false
private set
@@ -1291,6 +1284,7 @@
private val mediaPlayers = TreeMap<MediaSortKey, MediaControlPanel>(comparator)
private val mediaData: MutableMap<String, MediaSortKey> = mutableMapOf()
+
// A map that tracks order of visible media players before they get reordered.
private val visibleMediaPlayers = LinkedHashMap<String, MediaSortKey>()
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselScrollHandler.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselScrollHandler.kt
index ce50a11..bbb61b4 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselScrollHandler.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselScrollHandler.kt
@@ -30,7 +30,6 @@
import com.android.systemui.Gefingerpoken
import com.android.systemui.R
import com.android.systemui.classifier.Classifier.NOTIFICATION_DISMISS
-import com.android.systemui.classifier.FalsingCollector
import com.android.systemui.media.controls.util.MediaUiEventLogger
import com.android.systemui.plugins.FalsingManager
import com.android.systemui.qs.PageIndicator
@@ -59,7 +58,6 @@
private var translationChangedListener: () -> Unit,
private var seekBarUpdateListener: (visibleToUser: Boolean) -> Unit,
private val closeGuts: (immediate: Boolean) -> Unit,
- private val falsingCollector: FalsingCollector,
private val falsingManager: FalsingManager,
private val logSmartspaceImpression: (Boolean) -> Unit,
private val logger: MediaUiEventLogger
@@ -67,8 +65,10 @@
/** Is the view in RTL */
val isRtl: Boolean
get() = scrollView.isLayoutRtl
+
/** Do we need falsing protection? */
var falsingProtectionNeeded: Boolean = false
+
/** The width of the carousel */
private var carouselWidth: Int = 0
@@ -80,6 +80,7 @@
/** The content where the players are added */
private var mediaContent: ViewGroup
+
/** The gesture detector to detect touch gestures */
private val gestureDetector: GestureDetectorCompat
@@ -140,9 +141,6 @@
) = onScroll(down!!, lastMotion, distanceX)
override fun onDown(e: MotionEvent): Boolean {
- if (falsingProtectionNeeded) {
- falsingCollector.onNotificationStartDismissing()
- }
return false
}
}
@@ -263,9 +261,6 @@
private fun onTouch(motionEvent: MotionEvent): Boolean {
val isUp = motionEvent.action == MotionEvent.ACTION_UP
- if (isUp && falsingProtectionNeeded) {
- falsingCollector.onNotificationStopDismissing()
- }
if (gestureDetector.onTouchEvent(motionEvent)) {
if (isUp) {
// If this is an up and we're flinging, we don't want to have this touch reach
@@ -482,8 +477,11 @@
}
val relativeLocation =
visibleMediaIndex.toFloat() +
- if (playerWidthPlusPadding > 0) scrollInAmount.toFloat() / playerWidthPlusPadding
- else 0f
+ if (playerWidthPlusPadding > 0) {
+ scrollInAmount.toFloat() / playerWidthPlusPadding
+ } else {
+ 0f
+ }
// Fix the location, because PageIndicator does not handle RTL internally
val location =
if (isRtl) {
diff --git a/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt b/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt
index 809edc0..16885ed 100644
--- a/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/power/domain/interactor/PowerInteractor.kt
@@ -19,6 +19,7 @@
import android.os.PowerManager
import com.android.systemui.classifier.FalsingCollector
+import com.android.systemui.classifier.FalsingCollectorActual
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.keyguard.data.repository.KeyguardRepository
import com.android.systemui.plugins.statusbar.StatusBarStateController
@@ -34,7 +35,7 @@
constructor(
private val repository: PowerRepository,
private val keyguardRepository: KeyguardRepository,
- private val falsingCollector: FalsingCollector,
+ @FalsingCollectorActual private val falsingCollector: FalsingCollector,
private val screenOffAnimationController: ScreenOffAnimationController,
private val statusBarStateController: StatusBarStateController,
) {
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index a41d6e8..2466849 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -2818,7 +2818,6 @@
}
private void onTrackingStarted() {
- mFalsingCollector.onTrackingStarted(!mKeyguardStateController.canDismissLockScreen());
endClosing();
mTracking = true;
mTrackingStartedListener.onTrackingStarted();
@@ -2834,7 +2833,6 @@
}
private void onTrackingStopped(boolean expand) {
- mFalsingCollector.onTrackingStopped();
mTracking = false;
maybeStopTrackingExpansionFromStatusBar(expand);
@@ -2888,7 +2886,6 @@
@VisibleForTesting
void onUnlockHintStarted() {
- mFalsingCollector.onUnlockHintStarted();
mKeyguardIndicationController.showActionToUnlock();
mScrimController.setExpansionAffectsAlpha(false);
mNotificationStackScrollLayoutController.setUnlockHintRunning(true);
diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
index c9c911b..b2bbffd 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
@@ -67,7 +67,6 @@
import com.android.systemui.Dumpable;
import com.android.systemui.R;
import com.android.systemui.classifier.Classifier;
-import com.android.systemui.classifier.FalsingCollector;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.flags.FeatureFlags;
@@ -147,7 +146,6 @@
private final MediaHierarchyManager mMediaHierarchyManager;
private final AmbientState mAmbientState;
private final RecordingController mRecordingController;
- private final FalsingCollector mFalsingCollector;
private final LockscreenGestureLogger mLockscreenGestureLogger;
private final ShadeLogger mShadeLog;
private final KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor;
@@ -335,7 +333,6 @@
AmbientState ambientState,
RecordingController recordingController,
FalsingManager falsingManager,
- FalsingCollector falsingCollector,
AccessibilityManager accessibilityManager,
LockscreenGestureLogger lockscreenGestureLogger,
MetricsLogger metricsLogger,
@@ -381,7 +378,6 @@
mAmbientState = ambientState;
mRecordingController = recordingController;
mFalsingManager = falsingManager;
- mFalsingCollector = falsingCollector;
mAccessibilityManager = accessibilityManager;
mLockscreenGestureLogger = lockscreenGestureLogger;
@@ -1660,7 +1656,6 @@
}
}
if (shouldQuickSettingsIntercept(event.getX(), event.getY(), -1)) {
- mFalsingCollector.onQsDown();
mShadeLog.logMotionEvent(event,
"handleQsDown: down action, QS tracking enabled");
mTracking = true;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
index 25bb204..f004982 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
@@ -81,6 +81,7 @@
private val powerInteractor: PowerInteractor,
) : Dumpable {
private var pulseHeight: Float = 0f
+
@get:VisibleForTesting
var fractionToShade: Float = 0f
private set
@@ -255,17 +256,17 @@
private fun updateResources() {
fullTransitionDistance = context.resources.getDimensionPixelSize(
- R.dimen.lockscreen_shade_full_transition_distance)
+ R.dimen.lockscreen_shade_full_transition_distance)
fullTransitionDistanceByTap = context.resources.getDimensionPixelSize(
R.dimen.lockscreen_shade_transition_by_tap_distance)
notificationShelfTransitionDistance = context.resources.getDimensionPixelSize(
- R.dimen.lockscreen_shade_notif_shelf_transition_distance)
+ R.dimen.lockscreen_shade_notif_shelf_transition_distance)
depthControllerTransitionDistance = context.resources.getDimensionPixelSize(
- R.dimen.lockscreen_shade_depth_controller_transition_distance)
+ R.dimen.lockscreen_shade_depth_controller_transition_distance)
udfpsTransitionDistance = context.resources.getDimensionPixelSize(
- R.dimen.lockscreen_shade_udfps_keyguard_transition_distance)
+ R.dimen.lockscreen_shade_udfps_keyguard_transition_distance)
statusBarTransitionDistance = context.resources.getDimensionPixelSize(
- R.dimen.lockscreen_shade_status_bar_transition_distance)
+ R.dimen.lockscreen_shade_status_bar_transition_distance)
useSplitShade = LargeScreenUtils.shouldUseSplitNotificationShade(context.resources)
}
@@ -292,8 +293,8 @@
*/
internal fun canDragDown(): Boolean {
return (statusBarStateController.state == StatusBarState.KEYGUARD ||
- nsslController.isInLockedDownShade()) &&
- (qS.isFullyCollapsed || useSplitShade)
+ nsslController.isInLockedDownShade()) &&
+ (qS.isFullyCollapsed || useSplitShade)
}
/**
@@ -308,10 +309,15 @@
if (nsslController.isInLockedDownShade()) {
logger.logDraggedDownLockDownShade(startingChild)
statusBarStateController.setLeaveOpenOnKeyguardHide(true)
- activityStarter.dismissKeyguardThenExecute(OnDismissAction {
- nextHideKeyguardNeedsNoAnimation = true
- false
- }, cancelRunnable, false /* afterKeyguardGone */)
+ activityStarter.dismissKeyguardThenExecute(
+ {
+ nextHideKeyguardNeedsNoAnimation = true
+ false
+ },
+ cancelRunnable,
+ /* afterKeyguardGone= */
+ false,
+ )
} else {
logger.logDraggedDown(startingChild, dragLengthY)
if (!ambientState.isDozing() || startingChild != null) {
@@ -320,11 +326,18 @@
val animationHandler = { delay: Long ->
if (startingChild is ExpandableNotificationRow) {
startingChild.onExpandedByGesture(
- true /* drag down is always an open */)
+ true /* drag down is always an open */
+ )
}
shadeViewController.transitionToExpandedShade(delay)
- callbacks.forEach { it.setTransitionToFullShadeAmount(0f,
- true /* animated */, delay) }
+ callbacks.forEach {
+ it.setTransitionToFullShadeAmount(
+ 0f,
+ /* animated= */
+ true,
+ delay
+ )
+ }
// Let's reset ourselves, ready for the next animation
@@ -350,7 +363,12 @@
*/
internal fun onDragDownReset() {
logger.logDragDownAborted()
- nsslController.setDimmed(true /* dimmed */, true /* animated */)
+ nsslController.setDimmed(
+ /* dimmed= */
+ true,
+ /* animate= */
+ true,
+ )
nsslController.resetScrollPosition()
nsslController.resetCheckSnoozeLeavebehind()
setDragDownAmountAnimated(0f)
@@ -361,7 +379,12 @@
* @param above whether they dragged above it
*/
internal fun onCrossedThreshold(above: Boolean) {
- nsslController.setDimmed(!above /* dimmed */, true /* animate */)
+ nsslController.setDimmed(
+ /* dimmed= */
+ !above,
+ /* animate= */
+ true,
+ )
}
/**
@@ -411,8 +434,8 @@
*/
internal val isDragDownAnywhereEnabled: Boolean
get() = (statusBarStateController.getState() == StatusBarState.KEYGUARD &&
- !keyguardBypassController.bypassEnabled &&
- (qS.isFullyCollapsed || useSplitShade))
+ !keyguardBypassController.bypassEnabled &&
+ (qS.isFullyCollapsed || useSplitShade))
/**
* The amount in pixels that the user has dragged down.
@@ -429,8 +452,15 @@
qsTransitionController.dragDownAmount = value
- callbacks.forEach { it.setTransitionToFullShadeAmount(field,
- false /* animate */, 0 /* delay */) }
+ callbacks.forEach {
+ it.setTransitionToFullShadeAmount(
+ field,
+ /* animate= */
+ false,
+ /* delay= */
+ 0,
+ )
+ }
mediaHierarchyManager.setTransitionToFullShadeAmount(field)
scrimTransitionController.dragDownAmount = value
@@ -538,8 +568,11 @@
shadeViewController.transitionToExpandedShade(delay)
}
}
- goToLockedShadeInternal(expandedView, animationHandler,
- cancelAction = null)
+ goToLockedShadeInternal(
+ expandedView,
+ animationHandler,
+ cancelAction = null
+ )
}
}
@@ -570,14 +603,19 @@
var entry: NotificationEntry? = null
if (expandView is ExpandableNotificationRow) {
entry = expandView.entry
- entry.setUserExpanded(true /* userExpanded */, true /* allowChildExpansion */)
+ entry.setUserExpanded(
+ /* userExpanded= */
+ true,
+ /* allowChildExpansion= */
+ true,
+ )
// Indicate that the group expansion is changing at this time -- this way the group
// and children backgrounds / divider animations will look correct.
entry.setGroupExpansionChanging(true)
userId = entry.sbn.userId
}
var fullShadeNeedsBouncer = (
- !lockScreenUserManager.shouldShowLockscreenNotifications() ||
+ !lockScreenUserManager.shouldShowLockscreenNotifications() ||
falsingCollector.shouldEnforceBouncer())
if (keyguardBypassController.bypassEnabled) {
fullShadeNeedsBouncer = false
@@ -596,7 +634,10 @@
val cancelHandler = Runnable {
draggedDownEntry?.apply {
setUserLocked(false)
- notifyHeightChanged(false /* needsAnimation */)
+ notifyHeightChanged(
+ /* needsAnimation= */
+ false,
+ )
draggedDownEntry = null
}
cancelAction?.run()
@@ -614,7 +655,10 @@
// This call needs to be after updating the shade state since otherwise
// the scrimstate resets too early
if (animationHandler != null) {
- animationHandler.invoke(0 /* delay */)
+ animationHandler.invoke(
+ /* delay= */
+ 0,
+ )
} else {
performDefaultGoToFullShadeAnimation(0)
}
@@ -721,12 +765,13 @@
it.println("isDragDownAnywhereEnabled: $isDragDownAnywhereEnabled")
it.println("isFalsingCheckNeeded: $isFalsingCheckNeeded")
it.println("isWakingToShadeLocked: $isWakingToShadeLocked")
- it.println("hasPendingHandlerOnKeyguardDismiss: " +
- "${animationHandlerOnKeyguardDismiss != null}")
+ it.println(
+ "hasPendingHandlerOnKeyguardDismiss: " +
+ "${animationHandlerOnKeyguardDismiss != null}"
+ )
}
}
-
fun addCallback(callback: Callback) {
if (!callbacks.contains(callback)) {
callbacks.add(callback)
@@ -791,7 +836,7 @@
fun updateResources(context: Context) {
minDragDistance = context.resources.getDimensionPixelSize(
- R.dimen.keyguard_drag_down_min_distance)
+ R.dimen.keyguard_drag_down_min_distance)
val configuration = ViewConfiguration.get(context)
touchSlop = configuration.scaledTouchSlop.toFloat()
slopMultiplier = configuration.scaledAmbiguousGestureMultiplier
@@ -808,16 +853,17 @@
initialTouchY = y
initialTouchX = x
}
+
MotionEvent.ACTION_MOVE -> {
val h = y - initialTouchY
// Adjust the touch slop if another gesture may be being performed.
val touchSlop = if (event.classification
- == MotionEvent.CLASSIFICATION_AMBIGUOUS_GESTURE)
+ == MotionEvent.CLASSIFICATION_AMBIGUOUS_GESTURE) {
touchSlop * slopMultiplier
- else
+ } else {
touchSlop
+ }
if (h > touchSlop && h > Math.abs(x - initialTouchX)) {
- falsingCollector.onNotificationStartDraggingDown()
isDraggingDown = true
captureStartingChild(initialTouchX, initialTouchY)
initialTouchY = y
@@ -858,8 +904,9 @@
}
return true
}
+
MotionEvent.ACTION_UP -> if (!falsingManager.isUnlockingDisabled && !isFalseTouch &&
- dragDownCallback.canDragDown()) {
+ dragDownCallback.canDragDown()) {
dragDownCallback.onDraggedDown(startingChild, (y - initialTouchY).toInt())
if (startingChild != null) {
expandCallback.setUserLockedChild(startingChild, false)
@@ -870,6 +917,7 @@
stopDragging()
return false
}
+
MotionEvent.ACTION_CANCEL -> {
stopDragging()
return false
@@ -913,8 +961,8 @@
@VisibleForTesting
fun cancelChildExpansion(
- child: ExpandableView,
- animationDuration: Long = SPRING_BACK_ANIMATION_LENGTH_MS
+ child: ExpandableView,
+ animationDuration: Long = SPRING_BACK_ANIMATION_LENGTH_MS
) {
if (child.actualHeight == child.collapsedHeight) {
expandCallback.setUserLockedChild(child, false)
@@ -936,7 +984,6 @@
}
private fun stopDragging() {
- falsingCollector.onNotificationStopDraggingDown()
if (startingChild != null) {
cancelChildExpansion(startingChild!!)
startingChild = null
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
index fc6eaa8..2c0741e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
@@ -28,10 +28,10 @@
import android.view.VelocityTracker
import android.view.ViewConfiguration
import androidx.annotation.VisibleForTesting
+import com.android.app.animation.Interpolators
import com.android.systemui.Dumpable
import com.android.systemui.Gefingerpoken
import com.android.systemui.R
-import com.android.app.animation.Interpolators
import com.android.systemui.classifier.Classifier.NOTIFICATION_DRAG_DOWN
import com.android.systemui.classifier.FalsingCollector
import com.android.systemui.dagger.SysUISingleton
@@ -76,6 +76,7 @@
companion object {
private val SPRING_BACK_ANIMATION_LENGTH_MS = 375
}
+
private val mPowerManager: PowerManager?
private var mInitialTouchX: Float = 0.0f
@@ -94,7 +95,10 @@
pulseExpandAbortListener?.run()
}
}
- headsUpManager.unpinAll(true /* userUnPinned */)
+ headsUpManager.unpinAll(
+ /*userUnPinned= */
+ true,
+ )
}
}
var leavingLockscreen: Boolean = false
@@ -168,7 +172,6 @@
MotionEvent.ACTION_MOVE -> {
val h = y - mInitialTouchY
if (h > touchSlop && h > Math.abs(x - mInitialTouchX)) {
- falsingCollector.onStartExpandingFromPulse()
isExpanding = true
captureStartingChild(mInitialTouchX, mInitialTouchY)
mInitialTouchY = y
@@ -200,14 +203,14 @@
event.action == MotionEvent.ACTION_UP) && isExpanding
val isDraggingNotificationOrCanBypass = mStartingChild?.showingPulsing() == true ||
- bypassController.canBypass()
+ bypassController.canBypass()
if ((!canHandleMotionEvent() || !isDraggingNotificationOrCanBypass) && !finishExpanding) {
// We allow cancellations/finishing to still go through here to clean up the state
return false
}
if (velocityTracker == null || !isExpanding ||
- event.actionMasked == MotionEvent.ACTION_DOWN) {
+ event.actionMasked == MotionEvent.ACTION_DOWN) {
return startExpansion(event)
}
velocityTracker!!.addMovement(event)
@@ -217,9 +220,12 @@
when (event.actionMasked) {
MotionEvent.ACTION_MOVE -> updateExpansionHeight(moveDistance)
MotionEvent.ACTION_UP -> {
- velocityTracker!!.computeCurrentVelocity(1000 /* units */)
+ velocityTracker!!.computeCurrentVelocity(
+ /* units= */
+ 1000,
+ )
val canExpand = moveDistance > 0 && velocityTracker!!.getYVelocity() > -1000 &&
- statusBarStateController.state != StatusBarState.SHADE
+ statusBarStateController.state != StatusBarState.SHADE
if (!falsingManager.isUnlockingDisabled && !isFalseTouch && canExpand) {
finishExpansion()
} else {
@@ -227,6 +233,7 @@
}
recycleVelocityTracker()
}
+
MotionEvent.ACTION_CANCEL -> {
cancelExpansion()
recycleVelocityTracker()
@@ -243,17 +250,25 @@
}
if (statusBarStateController.isDozing) {
wakeUpCoordinator.willWakeUp = true
- mPowerManager!!.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE,
- "com.android.systemui:PULSEDRAG")
+ mPowerManager!!.wakeUp(
+ SystemClock.uptimeMillis(),
+ PowerManager.WAKE_REASON_GESTURE,
+ "com.android.systemui:PULSEDRAG"
+ )
}
- lockscreenShadeTransitionController.goToLockedShade(startingChild,
- needsQSAnimation = false)
+ lockscreenShadeTransitionController.goToLockedShade(
+ startingChild,
+ needsQSAnimation = false
+ )
lockscreenShadeTransitionController.finishPulseAnimation(cancelled = false)
leavingLockscreen = true
isExpanding = false
if (mStartingChild is ExpandableNotificationRow) {
val row = mStartingChild as ExpandableNotificationRow?
- row!!.onExpandedByGesture(true /* userExpanded */)
+ row!!.onExpandedByGesture(
+ /*userExpanded= */
+ true,
+ )
}
}
@@ -261,15 +276,20 @@
var expansionHeight = max(height, 0.0f)
if (mStartingChild != null) {
val child = mStartingChild!!
- val newHeight = Math.min((child.collapsedHeight + expansionHeight).toInt(),
- child.maxContentHeight)
+ val newHeight = Math.min(
+ (child.collapsedHeight + expansionHeight).toInt(),
+ child.maxContentHeight
+ )
child.actualHeight = newHeight
} else {
wakeUpCoordinator.setNotificationsVisibleForExpansion(
height
> lockscreenShadeTransitionController.distanceUntilShowingPulsingNotifications,
- true /* animate */,
- true /* increaseSpeed */)
+ /*animate= */
+ true,
+ /*increaseSpeed= */
+ true
+ )
}
lockscreenShadeTransitionController.setPulseHeight(expansionHeight, animate = false)
}
@@ -285,8 +305,8 @@
@VisibleForTesting
fun reset(
- child: ExpandableView,
- animationDuration: Long = SPRING_BACK_ANIMATION_LENGTH_MS.toLong()
+ child: ExpandableView,
+ animationDuration: Long = SPRING_BACK_ANIMATION_LENGTH_MS.toLong()
) {
if (child.actualHeight == child.collapsedHeight) {
setUserLocked(child, false)
@@ -315,15 +335,19 @@
private fun cancelExpansion() {
isExpanding = false
- falsingCollector.onExpansionFromPulseStopped()
if (mStartingChild != null) {
reset(mStartingChild!!)
mStartingChild = null
}
lockscreenShadeTransitionController.finishPulseAnimation(cancelled = true)
- wakeUpCoordinator.setNotificationsVisibleForExpansion(false /* visible */,
- true /* animate */,
- false /* increaseSpeed */)
+ wakeUpCoordinator.setNotificationsVisibleForExpansion(
+ /*visible= */
+ false,
+ /*animate= */
+ true,
+ /*increaseSpeed= */
+ false
+ )
}
private fun findView(x: Float, y: Float): ExpandableView? {
@@ -335,7 +359,9 @@
val childAtRawPosition = stackScrollerController.getChildAtRawPosition(totalX, totalY)
return if (childAtRawPosition != null && childAtRawPosition.isContentExpandable) {
childAtRawPosition
- } else null
+ } else {
+ null
+ }
}
fun setUp(stackScrollerController: NotificationStackScrollLayoutController) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index d92d11b..c02382d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -74,7 +74,6 @@
import com.android.internal.widget.CachingIconView;
import com.android.internal.widget.CallLayout;
import com.android.systemui.R;
-import com.android.systemui.classifier.FalsingCollector;
import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.flags.Flags;
import com.android.systemui.flags.ViewRefactorFlag;
@@ -245,7 +244,6 @@
private NotificationEntry mEntry;
private String mAppName;
private FalsingManager mFalsingManager;
- private FalsingCollector mFalsingCollector;
/**
* Whether or not the notification is using the heads up view and should peek from the top.
@@ -1711,7 +1709,6 @@
OnExpandClickListener onExpandClickListener,
CoordinateOnClickListener onFeedbackClickListener,
FalsingManager falsingManager,
- FalsingCollector falsingCollector,
StatusBarStateController statusBarStateController,
PeopleNotificationIdentifier peopleNotificationIdentifier,
OnUserInteractionCallback onUserInteractionCallback,
@@ -1743,7 +1740,6 @@
mOnExpandClickListener = onExpandClickListener;
setOnFeedbackClickListener(onFeedbackClickListener);
mFalsingManager = falsingManager;
- mFalsingCollector = falsingCollector;
mStatusBarStateController = statusBarStateController;
mPeopleNotificationIdentifier = peopleNotificationIdentifier;
for (NotificationContentView l : mLayouts) {
@@ -2471,7 +2467,6 @@
* @param allowChildExpansion whether a call to this method allows expanding children
*/
public void setUserExpanded(boolean userExpanded, boolean allowChildExpansion) {
- mFalsingCollector.setNotificationExpanded();
if (mIsSummaryWithChildren && !shouldShowPublic() && allowChildExpansion
&& !mChildrenContainer.showingAsLowPriority()) {
final boolean wasExpanded = mGroupExpansionManager.isGroupExpanded(mEntry);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java
index 80f5d19..af55f44 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java
@@ -34,7 +34,6 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.IStatusBarService;
-import com.android.systemui.classifier.FalsingCollector;
import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.flags.Flags;
import com.android.systemui.plugins.FalsingManager;
@@ -102,7 +101,6 @@
private final NotificationGutsManager mNotificationGutsManager;
private final OnUserInteractionCallback mOnUserInteractionCallback;
private final FalsingManager mFalsingManager;
- private final FalsingCollector mFalsingCollector;
private final FeatureFlags mFeatureFlags;
private final boolean mAllowLongPress;
private final PeopleNotificationIdentifier mPeopleNotificationIdentifier;
@@ -222,7 +220,6 @@
@Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean allowLongPress,
OnUserInteractionCallback onUserInteractionCallback,
FalsingManager falsingManager,
- FalsingCollector falsingCollector,
FeatureFlags featureFlags,
PeopleNotificationIdentifier peopleNotificationIdentifier,
Optional<BubblesManager> bubblesManagerOptional,
@@ -251,7 +248,6 @@
mFalsingManager = falsingManager;
mOnFeedbackClickListener = mNotificationGutsManager::openGuts;
mAllowLongPress = allowLongPress;
- mFalsingCollector = falsingCollector;
mFeatureFlags = featureFlags;
mPeopleNotificationIdentifier = peopleNotificationIdentifier;
mBubblesManagerOptional = bubblesManagerOptional;
@@ -285,7 +281,6 @@
mOnExpandClickListener,
mOnFeedbackClickListener,
mFalsingManager,
- mFalsingCollector,
mStatusBarStateController,
mPeopleNotificationIdentifier,
mOnUserInteractionCallback,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
index 6db8df9..d8f513c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
@@ -455,7 +455,6 @@
@Override
public void onDragCancelled(View v) {
- mFalsingCollector.onNotificationStopDismissing();
}
/**
@@ -501,7 +500,6 @@
}
mView.addSwipedOutView(view);
- mFalsingCollector.onNotificationDismissed();
if (mFalsingCollector.shouldEnforceBouncer()) {
mActivityStarter.executeRunnableDismissingKeyguard(
null,
@@ -549,7 +547,6 @@
@Override
public void onBeginDrag(View v) {
- mFalsingCollector.onNotificationStartDismissing();
mView.onSwipeBegin(v);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt
index ef51e47..3961a94 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt
@@ -33,7 +33,6 @@
import com.android.keyguard.TestScopeProvider
import com.android.systemui.R
import com.android.systemui.SysuiTestCase
-import com.android.systemui.classifier.FalsingCollector
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.dump.DumpManager
import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
@@ -105,7 +104,6 @@
@Mock @Main private lateinit var executor: DelayableExecutor
@Mock lateinit var mediaDataManager: MediaDataManager
@Mock lateinit var configurationController: ConfigurationController
- @Mock lateinit var falsingCollector: FalsingCollector
@Mock lateinit var falsingManager: FalsingManager
@Mock lateinit var dumpManager: DumpManager
@Mock lateinit var logger: MediaUiEventLogger
@@ -146,7 +144,6 @@
executor,
mediaDataManager,
configurationController,
- falsingCollector,
falsingManager,
dumpManager,
logger,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
index 209dcc1d..c573ac63 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
@@ -716,7 +716,6 @@
mAmbientState,
mRecordingController,
mFalsingManager,
- new FalsingCollectorFake(),
mAccessibilityManager,
mLockscreenGestureLogger,
mMetricsLogger,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java
index e22e571..ab0ae05 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerBaseTest.java
@@ -37,7 +37,6 @@
import com.android.keyguard.TestScopeProvider;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
-import com.android.systemui.classifier.FalsingCollector;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.fragments.FragmentHostManager;
@@ -132,7 +131,6 @@
@Mock protected AmbientState mAmbientState;
@Mock protected RecordingController mRecordingController;
@Mock protected FalsingManager mFalsingManager;
- @Mock protected FalsingCollector mFalsingCollector;
@Mock protected AccessibilityManager mAccessibilityManager;
@Mock protected LockscreenGestureLogger mLockscreenGestureLogger;
@Mock protected MetricsLogger mMetricsLogger;
@@ -242,7 +240,6 @@
mAmbientState,
mRecordingController,
mFalsingManager,
- mFalsingCollector,
mAccessibilityManager,
mLockscreenGestureLogger,
mMetricsLogger,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt
index 0cc0b98..7c8199e 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt
@@ -27,7 +27,6 @@
import com.android.internal.logging.MetricsLogger
import com.android.internal.statusbar.IStatusBarService
import com.android.systemui.SysuiTestCase
-import com.android.systemui.classifier.FalsingCollector
import com.android.systemui.dump.logcatLogBuffer
import com.android.systemui.flags.FeatureFlags
import com.android.systemui.plugins.FalsingManager
@@ -57,6 +56,7 @@
import com.android.systemui.util.mockito.withArgCaptor
import com.android.systemui.util.time.SystemClock
import com.android.systemui.wmshell.BubblesManager
+import java.util.Optional
import junit.framework.Assert
import org.junit.After
import org.junit.Before
@@ -68,7 +68,6 @@
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.Mockito.`when` as whenever
-import java.util.Optional
@SmallTest
@RunWith(AndroidTestingRunner::class)
@@ -100,7 +99,6 @@
private val gutsManager: NotificationGutsManager = mock()
private val onUserInteractionCallback: OnUserInteractionCallback = mock()
private val falsingManager: FalsingManager = mock()
- private val falsingCollector: FalsingCollector = mock()
private val featureFlags: FeatureFlags = mock()
private val peopleNotificationIdentifier: PeopleNotificationIdentifier = mock()
private val bubblesManager: BubblesManager = mock()
@@ -140,7 +138,6 @@
/*allowLongPress=*/ false,
onUserInteractionCallback,
falsingManager,
- falsingCollector,
featureFlags,
peopleNotificationIdentifier,
Optional.of(bubblesManager),
@@ -226,20 +223,20 @@
fun registerSettingsListener_forBubbles() {
controller.init(mock(NotificationEntry::class.java))
val viewStateObserver = withArgCaptor {
- verify(view).addOnAttachStateChangeListener(capture());
+ verify(view).addOnAttachStateChangeListener(capture())
}
- viewStateObserver.onViewAttachedToWindow(view);
- verify(settingsController).addCallback(any(), any());
+ viewStateObserver.onViewAttachedToWindow(view)
+ verify(settingsController).addCallback(any(), any())
}
@Test
fun unregisterSettingsListener_forBubbles() {
controller.init(mock(NotificationEntry::class.java))
val viewStateObserver = withArgCaptor {
- verify(view).addOnAttachStateChangeListener(capture());
+ verify(view).addOnAttachStateChangeListener(capture())
}
- viewStateObserver.onViewDetachedFromWindow(view);
- verify(settingsController).removeCallback(any(), any());
+ viewStateObserver.onViewDetachedFromWindow(view)
+ verify(settingsController).removeCallback(any(), any())
}
@Test
@@ -263,11 +260,17 @@
whenever(view.privateLayout).thenReturn(childView)
controller.mSettingsListener.onSettingChanged(
- BUBBLES_SETTING_URI, view.entry.sbn.userId, "1")
+ BUBBLES_SETTING_URI,
+ view.entry.sbn.userId,
+ "1"
+ )
verify(childView).setBubblesEnabledForUser(true)
controller.mSettingsListener.onSettingChanged(
- BUBBLES_SETTING_URI, view.entry.sbn.userId, "9")
+ BUBBLES_SETTING_URI,
+ view.entry.sbn.userId,
+ "9"
+ )
verify(childView).setBubblesEnabledForUser(false)
}
@@ -277,13 +280,12 @@
whenever(view.privateLayout).thenReturn(childView)
val notification = Notification.Builder(mContext).build()
- val sbn = SbnBuilder().setNotification(notification)
- .setUser(UserHandle.of(USER_ALL))
- .build()
- whenever(view.entry).thenReturn(NotificationEntryBuilder()
- .setSbn(sbn)
- .setUser(UserHandle.of(USER_ALL))
- .build())
+ val sbn =
+ SbnBuilder().setNotification(notification).setUser(UserHandle.of(USER_ALL)).build()
+ whenever(view.entry)
+ .thenReturn(
+ NotificationEntryBuilder().setSbn(sbn).setUser(UserHandle.of(USER_ALL)).build()
+ )
controller.mSettingsListener.onSettingChanged(BUBBLES_SETTING_URI, 9, "1")
verify(childView).setBubblesEnabledForUser(true)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
index 0425830..9dfcb3f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
@@ -54,7 +54,6 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.IStatusBarService;
import com.android.systemui.TestableDependency;
-import com.android.systemui.classifier.FalsingCollectorFake;
import com.android.systemui.classifier.FalsingManagerFake;
import com.android.systemui.flags.FakeFeatureFlags;
import com.android.systemui.flags.FeatureFlags;
@@ -600,7 +599,6 @@
mock(OnExpandClickListener.class),
mock(ExpandableNotificationRow.CoordinateOnClickListener.class),
new FalsingManagerFake(),
- new FalsingCollectorFake(),
mStatusBarStateController,
mPeopleNotificationIdentifier,
mOnUserInteractionCallback,