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

Merge "Use the same animation setup in InsetsController for rounded corners" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-25 09:18:28 +00:00
committed by Android (Google) Code Review
parent 2226d3d308 b25bb96223
commit 12740ad577
1 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java
View File

@@ -25,6 +25,7 @@ import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Property; import android.util.Property;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.InsetsController;
import android.view.InsetsSource; import android.view.InsetsSource;
import android.view.InsetsState; import android.view.InsetsState;
import android.view.MotionEvent; import android.view.MotionEvent;
@@ -34,7 +35,6 @@ import android.view.View;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.animation.Interpolator;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -51,12 +51,6 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
public static final long TOUCH_ANIMATION_DURATION = 150; public static final long TOUCH_ANIMATION_DURATION = 150;
public static final long TOUCH_RELEASE_ANIMATION_DURATION = 200; public static final long TOUCH_RELEASE_ANIMATION_DURATION = 200;
// TODO(b/191269755): use the value defined in InsetsController.
private static final Interpolator RESIZE_INTERPOLATOR = Interpolators.LINEAR;
// TODO(b/191269755): use the value defined in InsetsController.
private static final int ANIMATION_DURATION_RESIZE = 300;
/** The task bar expanded height. Used to determine whether to insets divider bounds or not. */ /** The task bar expanded height. Used to determine whether to insets divider bounds or not. */
private float mExpandedTaskBarHeight; private float mExpandedTaskBarHeight;
@@ -142,8 +136,8 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
if (animate) { if (animate) {
ObjectAnimator animator = ObjectAnimator.ofInt(this, ObjectAnimator animator = ObjectAnimator.ofInt(this,
DIVIDER_HEIGHT_PROPERTY, mDividerBounds.height(), mTempRect.height()); DIVIDER_HEIGHT_PROPERTY, mDividerBounds.height(), mTempRect.height());
animator.setInterpolator(RESIZE_INTERPOLATOR); animator.setInterpolator(InsetsController.RESIZE_INTERPOLATOR);
animator.setDuration(ANIMATION_DURATION_RESIZE); animator.setDuration(InsetsController.ANIMATION_DURATION_RESIZE);
animator.start(); animator.start();
} else { } else {
DIVIDER_HEIGHT_PROPERTY.set(this, mTempRect.height()); DIVIDER_HEIGHT_PROPERTY.set(this, mTempRect.height());
@@ -226,16 +220,6 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
private void setTouching() { private void setTouching() {
setSlippery(false); setSlippery(false);
mHandle.setTouching(true, true); mHandle.setTouching(true, true);
if (isLandscape()) {
mBackground.animate().scaleX(1.4f);
} else {
mBackground.animate().scaleY(1.4f);
}
mBackground.animate()
.setInterpolator(Interpolators.TOUCH_RESPONSE)
.setDuration(TOUCH_ANIMATION_DURATION)
.translationZ(mTouchElevation)
.start();
// Lift handle as well so it doesn't get behind the background, even though it doesn't // Lift handle as well so it doesn't get behind the background, even though it doesn't
// cast shadow. // cast shadow.
mHandle.animate() mHandle.animate()
@@ -248,13 +232,6 @@ public class DividerView extends FrameLayout implements View.OnTouchListener {
private void releaseTouching() { private void releaseTouching() {
setSlippery(true); setSlippery(true);
mHandle.setTouching(false, true); mHandle.setTouching(false, true);
mBackground.animate()
.setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.setDuration(TOUCH_RELEASE_ANIMATION_DURATION)
.translationZ(0)
.scaleX(1f)
.scaleY(1f)
.start();
mHandle.animate() mHandle.animate()
.setInterpolator(Interpolators.FAST_OUT_SLOW_IN) .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
.setDuration(TOUCH_RELEASE_ANIMATION_DURATION) .setDuration(TOUCH_RELEASE_ANIMATION_DURATION)