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

Merge "Prevent divided by zero if animation is disable" into rvc-dev am: 2afeac4798

Browse Source 
Change-Id: Ie24186460f0f586612b42d18e4fe2b88ca7bf2ad
This commit is contained in:
TreeHugger Robot
2020-04-27 06:42:03 +00:00
committed by Automerger Merge Worker
parent 718ffe0e6a 2afeac4798
commit b00e45dd69
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/Dimmer.java
View File

@@ -382,8 +382,8 @@ class Dimmer {
@Override @Override
public void apply(SurfaceControl.Transaction t, SurfaceControl sc, long currentPlayTime) { public void apply(SurfaceControl.Transaction t, SurfaceControl sc, long currentPlayTime) {
float alpha = ((float) currentPlayTime / getDuration()) * (mToAlpha - mFromAlpha) final float fraction = getFraction(currentPlayTime);
+ mFromAlpha; final float alpha = fraction * (mToAlpha - mFromAlpha) + mFromAlpha;
t.setAlpha(sc, alpha); t.setAlpha(sc, alpha);
} }

10
services/core/java/com/android/server/wm/LocalAnimationAdapter.java
View File

@@ -130,6 +130,16 @@ class LocalAnimationAdapter implements AnimationAdapter {
*/ */
default boolean needsEarlyWakeup() { return false; } default boolean needsEarlyWakeup() { return false; }
/**
* @return The fraction of the animation, returns 1 if duration is 0.
*
* @param currentPlayTime The current play time.
*/
default float getFraction(float currentPlayTime) {
final float duration = getDuration();
return duration > 0 ? currentPlayTime / duration : 1.0f;
}
void dump(PrintWriter pw, String prefix); void dump(PrintWriter pw, String prefix);
default void dumpDebug(ProtoOutputStream proto, long fieldId) { default void dumpDebug(ProtoOutputStream proto, long fieldId) {

4
services/core/java/com/android/server/wm/ScreenRotationAnimation.java
View File

@@ -646,8 +646,8 @@ class ScreenRotationAnimation {
@Override @Override
public void apply(SurfaceControl.Transaction t, SurfaceControl leash, public void apply(SurfaceControl.Transaction t, SurfaceControl leash,
long currentPlayTime) { long currentPlayTime) {
float fraction = (float)currentPlayTime / (float)getDuration(); final float fraction = getFraction(currentPlayTime);
int color = (Integer) va.evaluate(fraction, startColor, endColor); final int color = (Integer) va.evaluate(fraction, startColor, endColor);
Color middleColor = Color.valueOf(color); Color middleColor = Color.valueOf(color);
rgbTmpFloat[0] = middleColor.red(); rgbTmpFloat[0] = middleColor.red();
rgbTmpFloat[1] = middleColor.green(); rgbTmpFloat[1] = middleColor.green();

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -5606,7 +5606,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
@Override @Override
public void apply(Transaction t, SurfaceControl leash, long currentPlayTime) { public void apply(Transaction t, SurfaceControl leash, long currentPlayTime) {
final float fraction = (float) currentPlayTime / getDuration(); final float fraction = getFraction(currentPlayTime);
final float v = mInterpolator.getInterpolation(fraction); final float v = mInterpolator.getInterpolation(fraction);
t.setPosition(leash, mFrom.x + (mTo.x - mFrom.x) * v, t.setPosition(leash, mFrom.x + (mTo.x - mFrom.x) * v,
mFrom.y + (mTo.y - mFrom.y) * v); mFrom.y + (mTo.y - mFrom.y) * v);