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

Commit 3d21f63d authored by András Kurucz's avatar András Kurucz
Browse files

[flexiglass] Verify flexi only NSSL methods are not called in legacy 

Add SceneContainerFlag.isUnexpectedlyInLegacyMode() checks to every
public NSSL method that should be exclusive for flexiglass.

Bug: 296118689
Test: run sysui with flexiglass off -> make sure no
isUnexpectedlyInLegacyMode() checks are hit
Flag: com.android.systemui.scene_container

Change-Id: Id046ca42d2b23104881203caa24b1a27c4b510e4
parent eb794002

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+14 −0
Original line number Diff line number Diff line
@@ -1154,11 +1154,13 @@ public class NotificationStackScrollLayout 


    @Override

    public void addHeadsUpHeightChangedListener(@NonNull Runnable runnable) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mHeadsUpHeightChangedListeners.addIfAbsent(runnable);

    }



    @Override

    public void removeHeadsUpHeightChangedListener(@NonNull Runnable runnable) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mHeadsUpHeightChangedListeners.remove(runnable);

    }
@@ -1234,11 +1236,13 @@ public class NotificationStackScrollLayout 


    @Override

    public void setScrolledToTop(boolean scrolledToTop) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mScrollViewFields.setScrolledToTop(scrolledToTop);

    }



    @Override

    public void setStackTop(float stackTop) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        if (mAmbientState.getStackTop() != stackTop) {

            mAmbientState.setStackTop(stackTop);

            onTopPaddingChanged(/* animate = */ isAddOrRemoveAnimationPending());
@@ -1247,43 +1251,51 @@ public class NotificationStackScrollLayout 


    @Override

    public void setStackCutoff(float stackCutoff) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mAmbientState.setStackCutoff(stackCutoff);

    }



    @Override

    public void setHeadsUpTop(float headsUpTop) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mAmbientState.setHeadsUpTop(headsUpTop);

        requestChildrenUpdate();

    }



    @Override

    public void setHeadsUpBottom(float headsUpBottom) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mAmbientState.setHeadsUpBottom(headsUpBottom);

        mStateAnimator.setHeadsUpAppearHeightBottom(Math.round(headsUpBottom));

    }



    @Override

    public void closeGutsOnSceneTouch() {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mController.closeControlsDueToOutsideTouch();

    }



    @Override

    public void setSyntheticScrollConsumer(@Nullable Consumer<Float> consumer) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mScrollViewFields.setSyntheticScrollConsumer(consumer);

    }



    @Override

    public void setCurrentGestureOverscrollConsumer(@Nullable Consumer<Boolean> consumer) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mScrollViewFields.setCurrentGestureOverscrollConsumer(consumer);

    }



    @Override

    public void setCurrentGestureInGutsConsumer(@Nullable Consumer<Boolean> consumer) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mScrollViewFields.setCurrentGestureInGutsConsumer(consumer);

    }



    @Override

    public void setRemoteInputRowBottomBoundConsumer(@Nullable Consumer<Float> consumer) {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return;

        mScrollViewFields.setRemoteInputRowBottomBoundConsumer(consumer);

    }
@@ -2606,11 +2618,13 @@ public class NotificationStackScrollLayout 


    @Override

    public int getTopHeadsUpHeight() {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return 0;

        return getTopHeadsUpIntrinsicHeight();

    }



    @Override

    public int getHeadsUpInset() {

        if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) return 0;

        return mHeadsUpInset;

    }