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

Merge "Fix media divider animator" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-25 22:49:58 +00:00
committed by Android (Google) Code Review
parent f48c1931a9 811f9e284c
commit 0ab8762cf6
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
private TouchAnimator mTranslationYAnimator; private TouchAnimator mTranslationYAnimator;
private TouchAnimator mNonfirstPageAnimator; private TouchAnimator mNonfirstPageAnimator;
private TouchAnimator mNonfirstPageDelayedAnimator; private TouchAnimator mNonfirstPageDelayedAnimator;
// This animates fading of SecurityFooter and media divider
private TouchAnimator mAllPagesDelayedAnimator;
private TouchAnimator mBrightnessAnimator; private TouchAnimator mBrightnessAnimator;
private boolean mNeedsAnimatorUpdate = false; private boolean mNeedsAnimatorUpdate = false;
@@ -296,19 +298,24 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
Builder builder = new Builder() Builder builder = new Builder()
.setStartDelay(EXPANDED_TILE_DELAY) .setStartDelay(EXPANDED_TILE_DELAY)
.addFloat(tileLayout, "alpha", 0, 1); .addFloat(tileLayout, "alpha", 0, 1);
mFirstPageDelayedAnimator = builder.build();
// Fade in the security footer and the divider as we reach the final position
builder = new Builder().setStartDelay(EXPANDED_TILE_DELAY);
if (mQsPanel.getSecurityFooter() != null) { if (mQsPanel.getSecurityFooter() != null) {
builder.addFloat(mQsPanel.getSecurityFooter().getView(), "alpha", 0, 1); builder.addFloat(mQsPanel.getSecurityFooter().getView(), "alpha", 0, 1);
} }
if (mQsPanel.getDivider() != null) { if (mQsPanel.getDivider() != null) {
builder.addFloat(mQsPanel.getDivider(), "alpha", 0, 1); builder.addFloat(mQsPanel.getDivider(), "alpha", 0, 1);
} }
mFirstPageDelayedAnimator = builder.build(); mAllPagesDelayedAnimator = builder.build();
if (mQsPanel.getSecurityFooter() != null) { if (mQsPanel.getSecurityFooter() != null) {
mAllViews.add(mQsPanel.getSecurityFooter().getView()); mAllViews.add(mQsPanel.getSecurityFooter().getView());
} }
if (mQsPanel.getDivider() != null) { if (mQsPanel.getDivider() != null) {
mAllViews.add(mQsPanel.getDivider()); mAllViews.add(mQsPanel.getDivider());
} }
float px = 0; float px = 0;
float py = 1; float py = 1;
if (tiles.size() <= 3) { if (tiles.size() <= 3) {
@@ -388,6 +395,9 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
mNonfirstPageAnimator.setPosition(position); mNonfirstPageAnimator.setPosition(position);
mNonfirstPageDelayedAnimator.setPosition(position); mNonfirstPageDelayedAnimator.setPosition(position);
} }
if (mAllowFancy) {
mAllPagesDelayedAnimator.setPosition(position);
}
} }
@Override @Override