Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I17a0db92359baec383b307817f1517d6edcf7896
This commit is contained in:
TreeHugger Robot
2021-09-21 12:50:03 +00:00
committed by Automerger Merge Worker
parent 7025a6c219 b17f8f0e0f
commit 865f3e8549
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
View File

@@ -64,7 +64,10 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
// Fade out faster than fade in to finish before QQS hides. // Fade out faster than fade in to finish before QQS hides.
private static final long QQS_FADE_OUT_DURATION = 50L; 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<>(); private final ArrayList<View> mAllViews = new ArrayList<>();
/** /**
* List of {@link View}s representing Quick Settings that are being animated from the quick QS * 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.setClipChildren(true);
tileView.setClipToPadding(true); tileView.setClipToPadding(true);
firstPageBuilder.addFloat(tileView.getSecondaryLabel(), "alpha", 0, 1); firstPageBuilder.addFloat(tileView.getSecondaryLabel(), "alpha", 0, 1);
mAllViews.add(tileView.getSecondaryLabel());
} }
mAllViews.add(tileView); mAllViews.add(tileView);