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

Commit 0c4ab666 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes from topic "caitlinshk-media-ttt-displayview" into tm-qpr-dev... 

Merge changes from topic "caitlinshk-media-ttt-displayview" into tm-qpr-dev am: dd38a02c am: 098d0621

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21024666



Change-Id: Ie1ea91acc63d312df2366e617a78cfbce788c36d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2da07cfc 098d0621

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

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ object Flags { 
    // TODO(b/263512203): Tracking Bug

    val MEDIA_EXPLICIT_INDICATOR = unreleasedFlag(911, "media_explicit_indicator", teamfood = true)



    // TODO(b/265813373): Tracking Bug

    val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE =

        unreleasedFlag(912, "media_ttt_dismiss_gesture", teamfood = true)



    // 1000 - dock

    val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag(1000, "simulate_dock_through_charging")

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

+4 −0
Original line number Diff line number Diff line
@@ -30,4 +30,8 @@ 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/media/taptotransfer/sender/MediaTttSenderCoordinator.kt

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ constructor( 
                    }

                },

            vibrationEffect = chipStateSender.transferStatus.vibrationEffect,

            allowSwipeToDismiss = true,

            windowTitle = MediaTttUtils.WINDOW_TITLE_SENDER,

            wakeReason = MediaTttUtils.WAKE_REASON_SENDER,

            timeoutMs = chipStateSender.timeout,

packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.accessibility.AccessibilityManager.FLAG_CONTENT_CONTROLS 
import android.view.accessibility.AccessibilityManager.FLAG_CONTENT_ICONS

import android.view.accessibility.AccessibilityManager.FLAG_CONTENT_TEXT

import androidx.annotation.CallSuper

import androidx.annotation.VisibleForTesting

import com.android.systemui.CoreStartable

import com.android.systemui.Dumpable

import com.android.systemui.dagger.qualifiers.Main
@@ -108,9 +109,10 @@ abstract class TemporaryViewDisplayController<T : TemporaryViewInfo, U : Tempora 
     * Whenever the current view disappears, the next-priority view will be displayed if it's still

     * valid.

     */

    @VisibleForTesting

    internal val activeViews: MutableList<DisplayInfo> = mutableListOf()



    private fun getCurrentDisplayInfo(): DisplayInfo? {

    internal fun getCurrentDisplayInfo(): DisplayInfo? {

        return activeViews.getOrNull(0)

    }

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

+41 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ constructor( 
    powerManager: PowerManager,

    private val falsingManager: FalsingManager,

    private val falsingCollector: FalsingCollector,

    private val swipeChipbarAwayGestureHandler: SwipeChipbarAwayGestureHandler?,

    private val viewUtil: ViewUtil,

    private val vibratorHelper: VibratorHelper,

    wakeLockBuilder: WakeLock.Builder,
@@ -105,6 +106,8 @@ constructor( 
        commonWindowLayoutParams.apply { gravity = Gravity.TOP.or(Gravity.CENTER_HORIZONTAL) }



    override fun updateView(newInfo: ChipbarInfo, currentView: ViewGroup) {

        updateGestureListening()



        logger.logViewUpdate(

            newInfo.windowTitle,

            newInfo.text.loadText(context),
@@ -228,6 +231,42 @@ constructor( 
            includeMargins = true,

            onAnimationEnd,

        )



        updateGestureListening()

    }



    private fun updateGestureListening() {

        if (swipeChipbarAwayGestureHandler == null) {

            return

        }



        val currentDisplayInfo = getCurrentDisplayInfo()

        if (currentDisplayInfo != null && currentDisplayInfo.info.allowSwipeToDismiss) {

            swipeChipbarAwayGestureHandler.setViewFetcher { currentDisplayInfo.view }

            swipeChipbarAwayGestureHandler.addOnGestureDetectedCallback(TAG) {

                onSwipeUpGestureDetected()

            }

        } else {

            swipeChipbarAwayGestureHandler.resetViewFetcher()

            swipeChipbarAwayGestureHandler.removeOnGestureDetectedCallback(TAG)

        }

    }



    private fun onSwipeUpGestureDetected() {

        val currentDisplayInfo = getCurrentDisplayInfo()

        if (currentDisplayInfo == null) {

            logger.logSwipeGestureError(id = null, errorMsg = "No info is being displayed")

            return

        }

        if (!currentDisplayInfo.info.allowSwipeToDismiss) {

            logger.logSwipeGestureError(

                id = currentDisplayInfo.info.id,

                errorMsg = "This view prohibits swipe-to-dismiss",

            )

            return

        }

        removeView(currentDisplayInfo.info.id, SWIPE_UP_GESTURE_REASON)

        updateGestureListening()

    }



    private fun ViewGroup.getInnerView(): ViewGroup {
@@ -250,3 +289,5 @@ constructor( 
private const val ANIMATION_IN_DURATION = 500L

private const val ANIMATION_OUT_DURATION = 250L

@IdRes private val INFO_TAG = R.id.tag_chipbar_info

private const val SWIPE_UP_GESTURE_REASON = "SWIPE_UP_GESTURE_DETECTED"

private const val TAG = "ChipbarCoordinator"