mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 02:38:20 +00:00
Merge "Make windows transform into icons quicker for certain devices." into tm-qpr-dev
This commit is contained in:
@@ -1416,7 +1416,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
animation.addListener(new AnimatorListenerAdapter() {
|
||||
@Override
|
||||
public void onAnimationStart(Animator animation) {
|
||||
anim.start(mLauncher, velocityPxPerS);
|
||||
anim.start(mLauncher, mDeviceProfile, velocityPxPerS);
|
||||
}
|
||||
});
|
||||
return anim;
|
||||
|
||||
@@ -1330,7 +1330,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
if (windowAnimation == null) {
|
||||
continue;
|
||||
}
|
||||
windowAnimation.start(mContext, velocityPxPerMs);
|
||||
DeviceProfile dp = mActivity == null ? null : mActivity.getDeviceProfile();
|
||||
windowAnimation.start(mContext, dp, velocityPxPerMs);
|
||||
mRunningWindowAnim[i] = RunningWindowAnim.wrap(windowAnimation);
|
||||
}
|
||||
homeAnimFactory.setSwipeVelocity(velocityPxPerMs.y);
|
||||
|
||||
@@ -358,7 +358,7 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
|
||||
};
|
||||
RectFSpringAnim windowAnim = createWindowAnimationToHome(startShift,
|
||||
homeAnimFactory)[0];
|
||||
windowAnim.start(mContext, velocityPxPerMs);
|
||||
windowAnim.start(mContext, mDp, velocityPxPerMs);
|
||||
return windowAnim;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -214,7 +214,7 @@ public class RectFSpringAnim extends ReleaseCheck {
|
||||
* @param context The activity context.
|
||||
* @param velocityPxPerMs Velocity of swipe in px/ms.
|
||||
*/
|
||||
public void start(Context context, PointF velocityPxPerMs) {
|
||||
public void start(Context context, @Nullable DeviceProfile profile, PointF velocityPxPerMs) {
|
||||
// Only tell caller that we ended if both x and y animations have ended.
|
||||
OnAnimationEndListener onXEndListener = ((animation, canceled, centerX, velocityX) -> {
|
||||
mRectXAnimEnded = true;
|
||||
@@ -252,7 +252,13 @@ public class RectFSpringAnim extends ReleaseCheck {
|
||||
float minVisibleChange = Math.abs(1f / mStartRect.height());
|
||||
ResourceProvider rp = DynamicResource.provider(context);
|
||||
float damping = rp.getFloat(R.dimen.swipe_up_rect_scale_damping_ratio);
|
||||
float stiffness = rp.getFloat(R.dimen.swipe_up_rect_scale_stiffness);
|
||||
|
||||
// Increase the stiffness for devices where we want the window size to transform quicker.
|
||||
boolean shouldUseHigherStiffness = profile != null
|
||||
&& (profile.isLandscape || profile.isTablet);
|
||||
float stiffness = shouldUseHigherStiffness
|
||||
? rp.getFloat(R.dimen.swipe_up_rect_scale_higher_stiffness)
|
||||
: rp.getFloat(R.dimen.swipe_up_rect_scale_stiffness);
|
||||
|
||||
mRectScaleAnim = new SpringAnimation(this, RECT_SCALE_PROGRESS)
|
||||
.setSpring(new SpringForce(1f)
|
||||
|
||||
@@ -156,6 +156,7 @@
|
||||
|
||||
<item name="swipe_up_rect_scale_damping_ratio" type="dimen" format="float">0.75</item>
|
||||
<item name="swipe_up_rect_scale_stiffness" type="dimen" format="float">200</item>
|
||||
<item name="swipe_up_rect_scale_higher_stiffness" type="dimen" format="float">400</item>
|
||||
|
||||
<item name="swipe_up_rect_xy_fling_friction" type="dimen" format="float">1.5</item>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user