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

Commit f6b63d6a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix media divider animator" into rvc-dev am: 0ab8762c 

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

Change-Id: Ic8d69efeff8fe4a2d83477ba1d59ee33eccbf22e
parents 612b936b 0ab8762c

packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java

+11 −1
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
    private TouchAnimator mTranslationYAnimator;

    private TouchAnimator mNonfirstPageAnimator;

    private TouchAnimator mNonfirstPageDelayedAnimator;

    // This animates fading of SecurityFooter and media divider

    private TouchAnimator mAllPagesDelayedAnimator;

    private TouchAnimator mBrightnessAnimator;

    private boolean mNeedsAnimatorUpdate = false;
@@ -296,19 +298,24 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
            Builder builder = new Builder()

                    .setStartDelay(EXPANDED_TILE_DELAY)

                    .addFloat(tileLayout, "alpha", 0, 1);

            mFirstPageDelayedAnimator = builder.build();



            // Fade in the security footer and the divider as we reach the final position

            builder = new Builder().setStartDelay(EXPANDED_TILE_DELAY);

            if (mQsPanel.getSecurityFooter() != null) {

                builder.addFloat(mQsPanel.getSecurityFooter().getView(), "alpha", 0, 1);

            }

            if (mQsPanel.getDivider() != null) {

                builder.addFloat(mQsPanel.getDivider(), "alpha", 0, 1);

            }

            mFirstPageDelayedAnimator = builder.build();

            mAllPagesDelayedAnimator = builder.build();

            if (mQsPanel.getSecurityFooter() != null) {

                mAllViews.add(mQsPanel.getSecurityFooter().getView());

            }

            if (mQsPanel.getDivider() != null) {

                mAllViews.add(mQsPanel.getDivider());

            }



            float px = 0;

            float py = 1;

            if (tiles.size() <= 3) {
@@ -388,6 +395,9 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
            mNonfirstPageAnimator.setPosition(position);

            mNonfirstPageDelayedAnimator.setPosition(position);

        }

        if (mAllowFancy) {

            mAllPagesDelayedAnimator.setPosition(position);

        }

    }



    @Override