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

Commit edfc7258 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge changes I7d682bd0,I8ed6a31e into udc-dev am: c9174e2f am: ec6f3c0f 

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



Change-Id: I4e9f6231102a411af11e3fe84ecf4db8b40b102e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04c188f7 ec6f3c0f

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


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;
@@ -184,6 +185,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
        }

        mAppearAnimator.setDuration(ANIMATION_DURATION);

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

        mAppearAnimator.addListener(getAnimationListener(CUJ_LOCKSCREEN_PIN_APPEAR));

        mAppearAnimator.start();

    }

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −2
Original line number Diff line number Diff line
@@ -702,6 +702,5 @@ object Flags { 


    // TODO(b/278761837): Tracking Bug

    @JvmField

    val USE_NEW_ACTIVITY_STARTER = unreleasedFlag(2801, name = "use_new_activity_starter",

            teamfood = true)

    val USE_NEW_ACTIVITY_STARTER = releasedFlag(2801, name = "use_new_activity_starter")

}