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

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

Merge "[Bouncer] Add entry animation" into tm-qpr-dev am: fc3eb20d am: 328503ee 

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



Change-Id: I1de48df69d2bceb2401049af299fbf85e0c99657
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f932c66 328503ee

packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml

+16 −13
Original line number Diff line number Diff line
@@ -17,23 +17,24 @@ 
*/

-->



<com.android.keyguard.KeyguardPINView

        xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.keyguard.KeyguardPINView xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/res-auto"

        xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/keyguard_pin_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

        androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    android:layout_gravity="center_horizontal|bottom"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:orientation="vertical"

        >

    androidprv:layout_maxWidth="@dimen/keyguard_security_width">



<androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/pin_container"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_marginBottom="8dp"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_weight="1"

        android:layoutDirection="ltr"

        android:orientation="vertical">
@@ -79,6 +80,8 @@ 
            android:layout_width="0dp"

            android:layout_height="0dp"

            android:orientation="horizontal"

            android:clipChildren="false"

            android:clipToPadding="false"



            androidprv:constraint_referenced_ids="key1,key2,key3,key4,key5,key6,key7,key8,key9,delete_button,key0,key_enter"

packages/SystemUI/res-keyguard/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        <item name="android:background">@null</item>

        <item name="android:textSize">32sp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

        <item name="android:paddingBottom">-16dp</item>

    </style>

    <style name="Widget.TextView.Password" parent="@android:style/Widget.TextView">

packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
    private final EmergencyButtonController mEmergencyButtonController;

    private boolean mPaused;





    // The following is used to ignore callbacks from SecurityViews that are no longer current

    // (e.g. face unlock). This avoids unwanted asynchronous events from messing with the

    // state for the current security method.

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+38 −25
Original line number Diff line number Diff line
@@ -16,23 +16,25 @@ 


package com.android.keyguard;



import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_PIN_APPEAR;

import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_PIN_DISAPPEAR;

import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_HALF_OPENED;

import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_UNKNOWN;



import android.animation.ValueAnimator;

import android.content.Context;

import android.content.res.Configuration;

import android.util.AttributeSet;

import android.util.MathUtils;

import android.view.View;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;



import androidx.constraintlayout.widget.ConstraintLayout;

import androidx.constraintlayout.widget.ConstraintSet;



import com.android.settingslib.animation.AppearAnimationUtils;

import com.android.settingslib.animation.DisappearAnimationUtils;

import com.android.systemui.R;

import com.android.systemui.animation.Interpolators;

import com.android.systemui.statusbar.policy.DevicePostureController.DevicePostureInt;



/**
@@ -40,7 +42,7 @@ import com.android.systemui.statusbar.policy.DevicePostureController.DevicePostu 
 */

public class KeyguardPINView extends KeyguardPinBasedInputView {



    private final AppearAnimationUtils mAppearAnimationUtils;

    ValueAnimator mAppearAnimator = ValueAnimator.ofFloat(0f, 1f);

    private final DisappearAnimationUtils mDisappearAnimationUtils;

    private final DisappearAnimationUtils mDisappearAnimationUtilsLocked;

    private ConstraintLayout mContainer;
@@ -54,7 +56,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 


    public KeyguardPINView(Context context, AttributeSet attrs) {

        super(context, attrs);

        mAppearAnimationUtils = new AppearAnimationUtils(context);

        mDisappearAnimationUtils = new DisappearAnimationUtils(context,

                125, 0.6f /* translationScale */,

                0.45f /* delayScale */, AnimationUtils.loadInterpolator(
@@ -169,25 +170,20 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 


    @Override

    public void startAppearAnimation() {

        enableClipping(false);

        setAlpha(1f);

        setTranslationY(mAppearAnimationUtils.getStartTranslation());

        AppearAnimationUtils.startTranslationYAnimation(this, 0 /* delay */, 500 /* duration */,

                0, mAppearAnimationUtils.getInterpolator(),

                getAnimationListener(CUJ_LOCKSCREEN_PIN_APPEAR));

        mAppearAnimationUtils.startAnimation2d(mViews,

                new Runnable() {

                    @Override

                    public void run() {

                        enableClipping(true);

        if (mAppearAnimator.isRunning()) {

            mAppearAnimator.cancel();

        }

                });

        mAppearAnimator.setDuration(650);

        mAppearAnimator.addUpdateListener(animation -> animate(animation.getAnimatedFraction()));

        mAppearAnimator.start();

    }



    public boolean startDisappearAnimation(boolean needsSlowUnlockTransition,

            final Runnable finishRunnable) {

        if (mAppearAnimator.isRunning()) {

            mAppearAnimator.cancel();

        }



        enableClipping(false);

        setTranslationY(0);

        DisappearAnimationUtils disappearAnimationUtils = needsSlowUnlockTransition

                        ? mDisappearAnimationUtilsLocked
@@ -195,7 +191,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
        disappearAnimationUtils.createAnimation(

                this, 0, 200, mDisappearYTranslation, false,

                mDisappearAnimationUtils.getInterpolator(), () -> {

                    enableClipping(true);

                    if (finishRunnable != null) {

                        finishRunnable.run();

                    }
@@ -204,14 +199,32 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
        return true;

    }



    private void enableClipping(boolean enable) {

        mContainer.setClipToPadding(enable);

        mContainer.setClipChildren(enable);

        setClipChildren(enable);

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;

    }



    /** Animate subviews according to expansion or time. */

    private void animate(float progress) {

        for (int i = 0; i < mViews.length; i++) {

            View[] row = mViews[i];

            for (View view : row) {

                if (view == null) {

                    continue;

                }



                float scaledProgress = MathUtils.constrain(

                        (progress - 0.075f * i) / (1f - 0.075f * mViews.length),

                        0f,

                        1f

                );

                view.setAlpha(scaledProgress);

                Interpolator interpolator = Interpolators.STANDARD_ACCELERATE;

                view.setTranslationY(40 - (40 * interpolator.getInterpolation(scaledProgress)));

                if (view instanceof NumPadAnimationListener) {

                    ((NumPadAnimationListener) view).setProgress(scaledProgress);

                }

            }

        }

    }

}

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipperController.java

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ public class KeyguardSecurityViewFlipperController 


        @Override

        public void onStartingToHide() {



        }

    }

}