PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct interpolator for tablet split confirm" into tm-qpr-dev

Browse Source
This commit is contained in:
Jeremy Sim
2022-10-07 08:20:58 +00:00
committed by Android (Google) Code Review
parent 15bab334cc a1d24cb85e
commit 65d95a8dae
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/util/PhoneSplitToConfirmTimings.java
-8
View File
@@ -16,10 +16,6 @@
package com.android.quickstep.util;
import static com.android.launcher3.anim.Interpolators.EMPHASIZED;
import android.view.animation.Interpolator;
/**
* Timings for the OverviewSplitSelect > confirmed animation on phones.
*/
@@ -33,8 +29,4 @@ public class PhoneSplitToConfirmTimings
public int getStagedRectSlideEnd() { return 333; }
public int getDuration() { return PHONE_CONFIRM_DURATION; }
public Interpolator getStagedRectXInterpolator() { return EMPHASIZED; }
public Interpolator getStagedRectYInterpolator() { return EMPHASIZED; }
public Interpolator getStagedRectScaleXInterpolator() { return EMPHASIZED; }
public Interpolator getStagedRectScaleYInterpolator() { return EMPHASIZED; }
}
quickstep/src/com/android/quickstep/util/SplitToConfirmTimings.java
+6 -4
View File
@@ -16,6 +16,8 @@
package com.android.quickstep.util;
import static com.android.launcher3.anim.Interpolators.EMPHASIZED;
import android.view.animation.Interpolator;
/**
@@ -33,12 +35,12 @@ abstract class SplitToConfirmTimings implements SplitAnimationTimings {
// Common timings
public int getInstructionsFadeStart() { return 0; }
public int getInstructionsFadeEnd() { return 67; }
public Interpolator getStagedRectXInterpolator() { return EMPHASIZED; }
public Interpolator getStagedRectYInterpolator() { return EMPHASIZED; }
public Interpolator getStagedRectScaleXInterpolator() { return EMPHASIZED; }
public Interpolator getStagedRectScaleYInterpolator() { return EMPHASIZED; }
abstract public int getDuration();
abstract public Interpolator getStagedRectXInterpolator();
abstract public Interpolator getStagedRectYInterpolator();
abstract public Interpolator getStagedRectScaleXInterpolator();
abstract public Interpolator getStagedRectScaleYInterpolator();
public float getInstructionsFadeStartOffset() {
return (float) getInstructionsFadeStart() / getDuration();
quickstep/src/com/android/quickstep/util/TabletSplitToConfirmTimings.java
-8
View File
@@ -16,10 +16,6 @@
package com.android.quickstep.util;
import static com.android.launcher3.anim.Interpolators.LINEAR;
import android.view.animation.Interpolator;
/**
* Timings for the OverviewSplitSelect > confirmed animation on tablets.
*/
@@ -33,8 +29,4 @@ public class TabletSplitToConfirmTimings
public int getStagedRectSlideEnd() { return 383; }
public int getDuration() { return TABLET_CONFIRM_DURATION; }
public Interpolator getStagedRectXInterpolator() { return LINEAR; }
public Interpolator getStagedRectYInterpolator() { return LINEAR; }
public Interpolator getStagedRectScaleXInterpolator() { return LINEAR; }
public Interpolator getStagedRectScaleYInterpolator() { return LINEAR; }
}