Merge "Fixing tiles losing subtext in split shade" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b17f8f0e0f
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user