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

Merge "Brightness slider animation, expand" into sc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2021-04-29 18:43:39 +00:00
committed by Android (Google) Code Review
parent 8e922b57f0 1488a0af62
commit 597863496b
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ import com.android.systemui.qs.tileimpl.HeightOverrideable;
import com.android.systemui.statusbar.CrossFadeHelper; import com.android.systemui.statusbar.CrossFadeHelper;
import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService;
import com.android.systemui.tuner.TunerService.Tunable; import com.android.systemui.tuner.TunerService.Tunable;
import com.android.wm.shell.animation.Interpolators;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -374,11 +375,14 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
// Make brightness appear static position and alpha in through second half. // Make brightness appear static position and alpha in through second half.
View brightness = mQsPanelController.getBrightnessView(); View brightness = mQsPanelController.getBrightnessView();
if (brightness != null) { if (brightness != null) {
firstPageBuilder.addFloat(brightness, "translationY", heightDiff, 0); firstPageBuilder.addFloat(brightness, "translationY",
brightness.getMeasuredHeight() * 0.5f, 0);
mBrightnessAnimator = new TouchAnimator.Builder() mBrightnessAnimator = new TouchAnimator.Builder()
.addFloat(brightness, "alpha", 0, 1) .addFloat(brightness, "alpha", 0, 1)
.setStartDelay(.5f) .addFloat(brightness, "scaleY", 0.3f, 1)
.setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.build(); .build();
brightness.setPivotY(0);
mAllViews.add(brightness); mAllViews.add(brightness);
} else { } else {
mBrightnessAnimator = null; mBrightnessAnimator = null;
@@ -476,9 +480,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
mFirstPageAnimator.setPosition(position); mFirstPageAnimator.setPosition(position);
mFirstPageDelayedAnimator.setPosition(position); mFirstPageDelayedAnimator.setPosition(position);
mTranslationYAnimator.setPosition(position); mTranslationYAnimator.setPosition(position);
if (mBrightnessAnimator != null) {
mBrightnessAnimator.setPosition(position);
}
if (mQQSTileHeightAnimator != null) { if (mQQSTileHeightAnimator != null) {
mQQSTileHeightAnimator.setPosition(position); mQQSTileHeightAnimator.setPosition(position);
} }
@@ -491,6 +492,9 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
} }
if (mAllowFancy) { if (mAllowFancy) {
mAllPagesDelayedAnimator.setPosition(position); mAllPagesDelayedAnimator.setPosition(position);
if (mBrightnessAnimator != null) {
mBrightnessAnimator.setPosition(position);
}
} }
} }
@@ -527,6 +531,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
v.setAlpha(1); v.setAlpha(1);
v.setTranslationX(0); v.setTranslationX(0);
v.setTranslationY(0); v.setTranslationY(0);
v.setScaleY(1f);
if (v instanceof SideLabelTileLayout) { if (v instanceof SideLabelTileLayout) {
((SideLabelTileLayout) v).setClipChildren(false); ((SideLabelTileLayout) v).setClipChildren(false);
((SideLabelTileLayout) v).setClipToPadding(false); ((SideLabelTileLayout) v).setClipToPadding(false);

1
packages/SystemUI/src/com/android/systemui/qs/TouchAnimator.java
View File

@@ -53,6 +53,7 @@ public class TouchAnimator {
} }
public void setPosition(float fraction) { public void setPosition(float fraction) {
if (Float.isNaN(fraction)) return;
float t = MathUtils.constrain((fraction - mStartDelay) / mSpan, 0, 1); float t = MathUtils.constrain((fraction - mStartDelay) / mSpan, 0, 1);
if (mInterpolator != null) { if (mInterpolator != null) {
t = mInterpolator.getInterpolation(t); t = mInterpolator.getInterpolation(t);