Use correct interpolator for tablet split confirm
This patch makes it so that the split-to-confirm animation on tablets uses the EMPHASIZED interpolator instead of the (incorrect) LINEAR interpolator. Fixes: 241126570 Test: Manual Change-Id: Ic3c91d439a79a492da7f32bdcd56b954edf6c947
This commit is contained in:
@@ -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; }
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user