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

Commit 061dfb3a authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Add method for adding expansion listener without firing event" into... 

Merge "Add method for adding expansion listener without firing event" into udc-dev am: 38d07cba am: 74533e4f

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



Change-Id: I16a0b9dfe62125fa8960865f972561b1461285e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 700a3b60 74533e4f

packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetector.kt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ constructor( 
    fun enable(onPanelInteraction: Runnable) {

        if (action == null) {

            action = Action(onPanelInteraction)

            shadeExpansionStateManager.addExpansionListener(this::onPanelExpansionChanged)

            shadeExpansionStateManager.addShadeExpansionListener(this::onPanelExpansionChanged)

        } else {

            Log.e(TAG, "Already enabled")

        }

packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionStateManager.kt

+9 −1
Original line number Diff line number Diff line
@@ -54,12 +54,20 @@ class ShadeExpansionStateManager @Inject constructor() : ShadeStateEvents { 
     * Listener will also be immediately notified with the current values.

     */

    fun addExpansionListener(listener: ShadeExpansionListener) {

        expansionListeners.add(listener)

        addShadeExpansionListener(listener)

        listener.onPanelExpansionChanged(

            ShadeExpansionChangeEvent(fraction, expanded, tracking, dragDownPxAmount)

        )

    }



    /**

     * Adds a listener that will be notified when the panel expansion fraction has changed.

     * @see #addExpansionListener

     */

    fun addShadeExpansionListener(listener: ShadeExpansionListener) {

        expansionListeners.add(listener)

    }



    /** Removes an expansion listener. */

    fun removeExpansionListener(listener: ShadeExpansionListener) {

        expansionListeners.remove(listener)