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

Commit d528be42 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Re-write conditional checks for animation" into main

parents 43a9f38d 9bc94e9c

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

+10 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ import androidx.viewpager.widget.ViewPager; 


import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.res.R;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.qs.QSPanel.QSTileLayout;

import com.android.systemui.qs.QSPanelControllerBase.TileRecord;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.res.R;



import java.util.ArrayList;

import java.util.List;
@@ -562,6 +562,12 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
        if (shouldNotRunAnimation(tilesToReveal)) {

            return;

        }

        // This method has side effects (beings the fake drag, if it returns true). If we have

        // decided that we want to do a tile reveal, we do a last check to verify that we can

        // actually perform a fake drag.

        if (!beginFakeDrag()) {

            return;

        }



        final int lastPageNumber = mPages.size() - 1;

        final TileLayout lastPage = mPages.get(lastPageNumber);
@@ -596,8 +602,10 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
    }



    private boolean shouldNotRunAnimation(Set<String> tilesToReveal) {

        // None of these have side effects. That way, we don't need to rely on short-circuiting

        // behavior

        boolean noAnimationNeeded = tilesToReveal.isEmpty() || mPages.size() < 2;

        boolean scrollingInProgress = getScrollX() != 0 || !beginFakeDrag();

        boolean scrollingInProgress = getScrollX() != 0 || !isFakeDragging();

        // checking mRunningInTestHarness to disable animation in functional testing as it caused

        // flakiness and is not needed there. Alternative solutions were more complex and would

        // still be either potentially flaky or modify internal data.