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

Commit 2019101e authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-22966073-CJPIHTAOGF" into udc-dev 

* changes:
  Revert "Release USE_NEW_ACTIVITY_STARTER"
  Revert "Add CUJ tracking in animation listener."
parents 5b7a0a86 5b5c151a

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
@@ -712,5 +712,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)

}
 
}