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

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

Merge "Fixing tiles losing subtext in split shade" into sc-v2-dev am: b17f8f0e am: 865f3e85 

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

Change-Id: I63fa0935e5b2eecaa960454c17f20f8fc8804733
parents 1365f422 865f3e85

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

+5 −1
Original line number Diff line number Diff line
@@ -64,7 +64,10 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
    // Fade out faster than fade in to finish before QQS hides.

    private static final long QQS_FADE_OUT_DURATION = 50L;





    /**

     * List of all views that will be reset when clearing animation state

     * see {@link #clearAnimationState()} }

     */

    private final ArrayList<View> mAllViews = new ArrayList<>();

    /**

     * List of {@link View}s representing Quick Settings that are being animated from the quick QS
@@ -397,6 +400,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
                    tileView.setClipChildren(true);

                    tileView.setClipToPadding(true);

                    firstPageBuilder.addFloat(tileView.getSecondaryLabel(), "alpha", 0, 1);

                    mAllViews.add(tileView.getSecondaryLabel());

                }



                mAllViews.add(tileView);