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

Commit 7999ec8f authored by Riley Jones's avatar Riley Jones
Browse files

Cleanup of floating_menu_display_cutout_support 

Bug: 409609997
Test: NONE
Flag: EXEMPT cleanup
Change-Id: I55d24aefcb18683a8bf4e780e3f8b1d91b593341
parent 58c1a029

packages/SystemUI/aconfig/accessibility.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -10,16 +10,6 @@ flag { 
    bug: "297556899"

}



flag {

    name: "floating_menu_display_cutout_support"

    namespace: "accessibility"

    description: "Makes FAB properly react to and avoid DisplayCutouts."

    bug: "384399408"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "floating_menu_drag_to_hide"

    namespace: "accessibility"

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationController.java

+5 −13
Original line number Diff line number Diff line
@@ -228,19 +228,11 @@ class MenuAnimationController { 
                createSpringForce(),

                finalPositionX);



        if (com.android.systemui.Flags.floatingMenuDisplayCutoutSupport()) {

        flingThenSpringMenuWith(DynamicAnimation.TRANSLATION_Y,

                velocityY,

                FLING_FRICTION_SCALAR,

                createSpringForce(),

                (finalPositionY != position.y) ? finalPositionY : null);

        } else {

            flingThenSpringMenuWith(DynamicAnimation.TRANSLATION_Y,

                    velocityY,

                    FLING_FRICTION_SCALAR,

                    createSpringForce(),

                    /* finalPosition= */ null);

        }

    }



    private void flingThenSpringMenuWith(DynamicAnimation.ViewProperty property, float velocity,