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

Commit 278e7d6d authored by Bill Lin's avatar Bill Lin Committed by Selim Cinek
Browse files

Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition 

NotificationPanelView detect the ACTION_DOWN X-position for expanding Panel
and dispatch x-offset to QSFrame and StackScroller
However, StackScroller reset the translateX via updateAntiBurnInTranslation()
Base on previous patches to enhance setAntiBurnInOffsetX policy
     1. ag/3536525 (Fixes: 72527703)
     2. ag/3846247 (Fixes: 77541088)

Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayoutTest.java
Change-Id: I52c86e865d97282e40b6f2847a2ff0190e4d80e9
Fix: 110102296
parent 4cc443ae

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+1 −1
Original line number Diff line number Diff line
@@ -2489,7 +2489,7 @@ public class NotificationPanelView extends PanelView implements 
    }



    protected void setVerticalPanelTranslation(float translation) {

        mNotificationStackScroller.setTranslationX(translation);

        mNotificationStackScroller.setVerticalPanelTranslation(translation);

        mQsFrame.setTranslationX(translation);

        int size = mVerticalTranslationListener.size();

        for (int i = 0; i < size; i++) {

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

+10 −4
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
    private int mHeadsUpInset;

    private HeadsUpAppearanceController mHeadsUpAppearanceController;

    private NotificationIconAreaController mIconAreaController;

    private float mVerticalPanelTranslation;



    public NotificationStackScrollLayout(Context context) {

        this(context, null);
@@ -4003,8 +4004,13 @@ public class NotificationStackScrollLayout extends ViewGroup 
        notifyHeightChangeListener(mShelf);

    }



    private void updateAntiBurnInTranslation() {

        setTranslationX(mAntiBurnInOffsetX * mDarkAmount);

    private void updatePanelTranslation() {

        setTranslationX(mVerticalPanelTranslation + mAntiBurnInOffsetX * mDarkAmount);

    }



    public void setVerticalPanelTranslation(float verticalPanelTranslation) {

        mVerticalPanelTranslation = verticalPanelTranslation;

        updatePanelTranslation();

    }



    /**
@@ -4034,7 +4040,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        }

        updateAlgorithmHeightAndPadding();

        updateBackgroundDimming();

        updateAntiBurnInTranslation();

        updatePanelTranslation();

        requestChildrenUpdate();

    }
@@ -4602,7 +4608,7 @@ public class NotificationStackScrollLayout extends ViewGroup 


    public void setAntiBurnInOffsetX(int antiBurnInOffsetX) {

        mAntiBurnInOffsetX = antiBurnInOffsetX;

        updateAntiBurnInTranslation();

        updatePanelTranslation();

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {