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

Commit 9adfd93b authored by Priyanka Advani's avatar Priyanka Advani Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-22966073-CJPIHTAOGF" into udc-dev am: 2019101e 

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



Change-Id: Ica432b8df187e3b7e085d896a29bad5d7cf96e87
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eead8ebf 2019101e

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

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




package com.android.keyguard;

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.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_HALF_OPENED;

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

import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_UNKNOWN;
@@ -185,7 +184,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
        }

        }

        mAppearAnimator.setDuration(ANIMATION_DURATION);

        mAppearAnimator.setDuration(ANIMATION_DURATION);

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

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

        mAppearAnimator.addListener(getAnimationListener(CUJ_LOCKSCREEN_PIN_APPEAR));

        mAppearAnimator.start();

        mAppearAnimator.start();

    }

    }

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

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




    // TODO(b/278761837): Tracking Bug

    // TODO(b/278761837): Tracking Bug

    @JvmField

    @JvmField

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

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

            teamfood = true)

}
 
}