From 6e72c732a2724ca597f66caab45d8e93ee66df90 Mon Sep 17 00:00:00 2001 From: Michal Brzezinski Date: Tue, 14 Sep 2021 18:58:50 +0100 Subject: Fixing tiles losing subtext in split shade The issue was caused by rotation from shade with fewer number of visible QQS tiles (portrait mode) to more visible QQS tiles (split shade). For tiles that were not visible in QQS, QSAnimator was setting their respective QS tiles alpha to 0. This value was not updated when they become visible in QQS split shade, so this change is making sure that all QS tiles that have corresponding visible QQS tile will have alpha set to 1 at the start of the animation. Bug: 196831963 Test: open portrait shade -> rotate to split shade -> expand QS - all tiles should have subtitles Change-Id: I44b2a532232748ece926d6ac7819ec0b8a809a51 --- packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index 8659b8b868d4..23c9408f0636 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -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 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); -- cgit v1.2.3-59-g8ed1b