diff options
5 files changed, 7 insertions, 33 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 289ad129edf8..b6f969d7b784 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -426,9 +426,6 @@ object Flags { // TODO(b/263272731): Tracking Bug val MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE = releasedFlag(910, "media_ttt_receiver_success_ripple") - // TODO(b/265813373): Tracking Bug - val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE = releasedFlag(912, "media_ttt_dismiss_gesture") - // TODO(b/266157412): Tracking Bug val MEDIA_RETAIN_SESSIONS = unreleasedFlag(913, "media_retain_sessions") diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt index 60504e43465a..8a565fa86b35 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt @@ -30,8 +30,4 @@ class MediaTttFlags @Inject constructor(private val featureFlags: FeatureFlags) /** Check whether the flag for the receiver success state is enabled. */ fun isMediaTttReceiverSuccessRippleEnabled(): Boolean = featureFlags.isEnabled(Flags.MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE) - - /** True if the media transfer chip can be dismissed via a gesture. */ - fun isMediaTttDismissGestureEnabled(): Boolean = - featureFlags.isEnabled(Flags.MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE) } diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt index 7ed56e72f759..7aeba666c95a 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt @@ -88,7 +88,7 @@ constructor( private val chipbarAnimator: ChipbarAnimator, private val falsingManager: FalsingManager, private val falsingCollector: FalsingCollector, - private val swipeChipbarAwayGestureHandler: SwipeChipbarAwayGestureHandler?, + private val swipeChipbarAwayGestureHandler: SwipeChipbarAwayGestureHandler, private val viewUtil: ViewUtil, private val vibratorHelper: VibratorHelper, wakeLockBuilder: WakeLock.Builder, @@ -289,10 +289,6 @@ constructor( } private fun updateGestureListening() { - if (swipeChipbarAwayGestureHandler == null) { - return - } - val currentDisplayInfo = getCurrentDisplayInfo() if (currentDisplayInfo != null && currentDisplayInfo.info.allowSwipeToDismiss) { swipeChipbarAwayGestureHandler.setViewFetcher { currentDisplayInfo.view } diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt index 9dbc4b398ab3..80de52332c23 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt @@ -19,10 +19,12 @@ package com.android.systemui.temporarydisplay.chipbar import android.content.Context import android.view.MotionEvent import android.view.View +import com.android.systemui.dagger.SysUISingleton import com.android.systemui.settings.DisplayTracker import com.android.systemui.statusbar.gesture.SwipeUpGestureHandler import com.android.systemui.statusbar.gesture.SwipeUpGestureLogger import com.android.systemui.util.boundsOnScreen +import javax.inject.Inject /** * A class to detect when a user has swiped the chipbar away. @@ -30,7 +32,10 @@ import com.android.systemui.util.boundsOnScreen * Effectively [SysUISingleton]. But, this shouldn't be created if the gesture isn't enabled. See * [TemporaryDisplayModule.provideSwipeChipbarAwayGestureHandler]. */ -class SwipeChipbarAwayGestureHandler( +@SysUISingleton +class SwipeChipbarAwayGestureHandler +@Inject +constructor( context: Context, displayTracker: DisplayTracker, logger: SwipeUpGestureLogger, diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt index cae13086f592..2d055736dcc3 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt @@ -16,14 +16,9 @@ package com.android.systemui.temporarydisplay.dagger -import android.content.Context import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBufferFactory -import com.android.systemui.media.taptotransfer.MediaTttFlags -import com.android.systemui.settings.DisplayTracker -import com.android.systemui.statusbar.gesture.SwipeUpGestureLogger -import com.android.systemui.temporarydisplay.chipbar.SwipeChipbarAwayGestureHandler import dagger.Module import dagger.Provides @@ -36,20 +31,5 @@ interface TemporaryDisplayModule { fun provideChipbarLogBuffer(factory: LogBufferFactory): LogBuffer { return factory.create("ChipbarLog", 40) } - - @Provides - @SysUISingleton - fun provideSwipeChipbarAwayGestureHandler( - mediaTttFlags: MediaTttFlags, - context: Context, - displayTracker: DisplayTracker, - logger: SwipeUpGestureLogger, - ): SwipeChipbarAwayGestureHandler? { - return if (mediaTttFlags.isMediaTttDismissGestureEnabled()) { - SwipeChipbarAwayGestureHandler(context, displayTracker, logger) - } else { - null - } - } } } |