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

Commit dd38a02c authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

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

* changes:
  [Media TTT] Allow swiping up to dismiss the chipbar.
  [Media TTT] Make the SwipeUpGestureHandler generic.
  [Media TTT] Re-name the status bar gesture handler to be more generic.
  [Media TTT] Use a listener pattern to notify about view removals.
parents d97d8192 b4314f1e

packages/SystemUI/ktfmt_includes.txt

+2 −2
Original line number Diff line number Diff line
@@ -321,8 +321,8 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt

-packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt

-packages/SystemUI/src/com/android/systemui/statusbar/gesture/GenericGestureDetector.kt

-packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeStatusBarAwayGestureHandler.kt

-packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeStatusBarAwayGestureLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureHandler.kt

-packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/gesture/TapGestureDetector.kt

-packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

-packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt

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

+4 −0
Original line number Diff line number Diff line
@@ -345,6 +345,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/log/dagger/LogModule.java

+4 −7
Original line number Diff line number Diff line
@@ -191,15 +191,12 @@ public class LogModule { 
                false /* systrace */);

    }



    /**

     * Provides a logging buffer for logs related to swiping away the status bar while in immersive

     * mode. See {@link com.android.systemui.statusbar.gesture.SwipeStatusBarAwayGestureLogger}.

     */

    /** Provides a logging buffer for logs related to swipe up gestures. */

    @Provides

    @SysUISingleton

    @SwipeStatusBarAwayLog

    public static LogBuffer provideSwipeAwayGestureLogBuffer(LogBufferFactory factory) {

        return factory.create("SwipeStatusBarAwayLog", 30);

    @SwipeUpLog

    public static LogBuffer provideSwipeUpLogBuffer(LogBufferFactory factory) {

        return factory.create("SwipeUpLog", 30);

    }



    /**

packages/SystemUI/src/com/android/systemui/log/dagger/SwipeStatusBarAwayLog.java→packages/SystemUI/src/com/android/systemui/log/dagger/SwipeUpLog.java

+2 −2
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ import javax.inject.Qualifier; 


/**

 * A {@link LogBuffer} for

 * {@link com.android.systemui.statusbar.gesture.SwipeStatusBarAwayGestureLogger}.

 * {@link com.android.systemui.statusbar.gesture.SwipeUpGestureLogger}.

 */

@Qualifier

@Documented

@Retention(RUNTIME)

public @interface SwipeStatusBarAwayLog {

public @interface SwipeUpLog {

}

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)

}