Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e697fa03 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Media] Remove MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE flag. 

Fixes: 265813373
Test: compiles
Test: atest ChipbarCoordinatorTest
Change-Id: I5f40ffba82c24ea4ed6350fe8c17b5aec504db9e
parent b2a8c5bf

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -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")

packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt

+0 −4
Original line number Diff line number Diff line
@@ -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)

}

packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt

+1 −5
Original line number Diff line number Diff line
@@ -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 }

packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandler.kt

+6 −1
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/src/com/android/systemui/temporarydisplay/dagger/TemporaryDisplayModule.kt

+0 −20
Original line number Diff line number Diff line
@@ -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

            }

        }

    }

}