Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fca2de57 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use the same animation setup in InsetsController for rounded corners"... 

Merge "Use the same animation setup in InsetsController for rounded corners" into sc-v2-dev am: 12740ad5 am: 01c56cd6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899312

Change-Id: I56ece72185b83331ab96409a01f50774cb001ec1
parents 7a86252e 01c56cd6

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

+3 −26
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Rect; 
import android.util.AttributeSet;

import android.util.Property;

import android.view.GestureDetector;

import android.view.InsetsController;

import android.view.InsetsSource;

import android.view.InsetsState;

import android.view.MotionEvent;
@@ -34,7 +35,6 @@ import android.view.View; 
import android.view.ViewConfiguration;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.view.animation.Interpolator;

import android.widget.FrameLayout;



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_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. */

    private float mExpandedTaskBarHeight;
@@ -142,8 +136,8 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
            if (animate) {

                ObjectAnimator animator = ObjectAnimator.ofInt(this,

                        DIVIDER_HEIGHT_PROPERTY, mDividerBounds.height(), mTempRect.height());

                animator.setInterpolator(RESIZE_INTERPOLATOR);

                animator.setDuration(ANIMATION_DURATION_RESIZE);

                animator.setInterpolator(InsetsController.RESIZE_INTERPOLATOR);

                animator.setDuration(InsetsController.ANIMATION_DURATION_RESIZE);

                animator.start();

            } else {

                DIVIDER_HEIGHT_PROPERTY.set(this, mTempRect.height());
@@ -226,16 +220,6 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
    private void setTouching() {

        setSlippery(false);

        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

        // cast shadow.

        mHandle.animate()
@@ -248,13 +232,6 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
    private void releaseTouching() {

        setSlippery(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()

                .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)

                .setDuration(TOUCH_RELEASE_ANIMATION_DURATION)