Merge "Remove UNOCCLUSION_TRANSITION flag" into udc-dev (36dd77a8) · Commits · e / os / android_frameworks_base

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@ import android.util.Slog;

		import com.android.keyguard.KeyguardClockSwitch.ClockSize;
		import com.android.keyguard.logging.KeyguardLogger;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.plugins.ClockAnimations;
		import com.android.systemui.statusbar.notification.AnimatableProperty;
		import com.android.systemui.statusbar.notification.PropertyAnimator;
		@@ -62,7 +60,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		ConfigurationController configurationController,
		DozeParameters dozeParameters,
		FeatureFlags featureFlags,
		ScreenOffAnimationController screenOffAnimationController,
		KeyguardLogger logger) {
		super(keyguardStatusView);
		@@ -73,8 +70,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
		mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, keyguardStateController,
		dozeParameters, screenOffAnimationController, /* animateYPos= */ true,
		logger.getBuffer());
		mKeyguardVisibilityHelper.setOcclusionTransitionFlagEnabled(
		featureFlags.isEnabled(Flags.UNOCCLUSION_TRANSITION));
		}

		@Override

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

+0 −21

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.notification.AnimatableProperty;
		import com.android.systemui.statusbar.notification.PropertyAnimator;
		import com.android.systemui.statusbar.notification.stack.AnimationProperties;
		import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.statusbar.phone.ScreenOffAnimationController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		@@ -49,7 +48,6 @@ public class KeyguardVisibilityHelper {
		private boolean mAnimateYPos;
		private boolean mKeyguardViewVisibilityAnimating;
		private boolean mLastOccludedState = false;
		private boolean mIsUnoccludeTransitionFlagEnabled = false;
		private final AnimationProperties mAnimationProperties = new AnimationProperties();
		private final LogBuffer mLogBuffer;

		@@ -77,10 +75,6 @@ public class KeyguardVisibilityHelper {
		return mKeyguardViewVisibilityAnimating;
		}

		public void setOcclusionTransitionFlagEnabled(boolean enabled) {
		mIsUnoccludeTransitionFlagEnabled = enabled;
		}

		/**
		* Set the visibility of a keyguard view based on some new state.
		*/
		@@ -156,24 +150,9 @@ public class KeyguardVisibilityHelper {
		// since it may need to be cancelled due to keyguard lifecycle events.
		mScreenOffAnimationController.animateInKeyguard(
		mView, mAnimateKeyguardStatusViewVisibleEndRunnable);
		} else if (!mIsUnoccludeTransitionFlagEnabled && mLastOccludedState && !isOccluded) {
		// An activity was displayed over the lock screen, and has now gone away
		log("Unoccluded transition");
		mView.setVisibility(View.VISIBLE);
		mView.setAlpha(0f);

		mView.animate()
		.setDuration(StackStateAnimator.ANIMATION_DURATION_WAKEUP)
		.setInterpolator(Interpolators.FAST_OUT_SLOW_IN)
		.alpha(1f)
		.withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable)
		.start();
		} else {
		log("Direct set Visibility to VISIBLE");
		mView.setVisibility(View.VISIBLE);
		if (!mIsUnoccludeTransitionFlagEnabled) {
		mView.setAlpha(1f);
		}
		}
		} else {
		log("Direct set Visibility to GONE");

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -189,10 +189,6 @@ object Flags {
		@JvmField
		val REVAMPED_WALLPAPER_UI = releasedFlag(222, "revamped_wallpaper_ui")

		/** A different path for unocclusion transitions back to keyguard */
		// TODO(b/262859270): Tracking Bug
		@JvmField val UNOCCLUSION_TRANSITION = releasedFlag(223, "unocclusion_transition")

		// flag for controlling auto pin confirmation and material u shapes in bouncer
		@JvmField
		val AUTO_PIN_CONFIRMATION =

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −10

Original line number	Diff line number	Diff line
		@@ -127,8 +127,6 @@ import com.android.systemui.classifier.FalsingCollector;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.dreams.DreamOverlayStateController;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.keyguard.dagger.KeyguardModule;
		import com.android.systemui.navigationbar.NavigationModeController;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		@@ -522,8 +520,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,

		private CentralSurfaces mCentralSurfaces;

		private boolean mUnocclusionTransitionFlagEnabled = false;

		private final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener =
		new DeviceConfig.OnPropertiesChangedListener() {
		@Override
		@@ -970,9 +966,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		public void onAnimationStart(int transit, RemoteAnimationTarget[] apps,
		RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps,
		IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {
		if (!mUnocclusionTransitionFlagEnabled) {
		setOccluded(true /* isOccluded /, true / animate */);
		}
		if (apps == null \|\| apps.length == 0 \|\| apps[0] == null) {
		if (DEBUG) {
		Log.d(TAG, "No apps provided to the OccludeByDream runner; "
		@@ -1023,7 +1016,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		@Override
		public void onAnimationEnd(Animator animation) {
		try {
		if (!mIsCancelled && mUnocclusionTransitionFlagEnabled) {
		if (!mIsCancelled) {
		// We're already on the main thread, don't queue this call
		handleSetOccluded(true /* isOccluded */,
		false /* animate */);
		@@ -1200,7 +1193,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		ScreenOnCoordinator screenOnCoordinator,
		InteractionJankMonitor interactionJankMonitor,
		DreamOverlayStateController dreamOverlayStateController,
		FeatureFlags featureFlags,
		Lazy<ShadeController> shadeControllerLazy,
		Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy,
		Lazy<ActivityLaunchAnimator> activityLaunchAnimator,
		@@ -1259,7 +1251,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,

		mDreamOpenAnimationDuration = (int) DREAMING_ANIMATION_DURATION_MS;
		mDreamCloseAnimationDuration = (int) LOCKSCREEN_ANIMATION_DURATION_MS;
		mUnocclusionTransitionFlagEnabled = featureFlags.isEnabled(Flags.UNOCCLUSION_TRANSITION);
		}

		public void userActivity() {

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.dreams.DreamOverlayStateController;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.keyguard.DismissCallbackRegistry;
		import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		@@ -113,7 +112,6 @@ public class KeyguardModule {
		ScreenOnCoordinator screenOnCoordinator,
		InteractionJankMonitor interactionJankMonitor,
		DreamOverlayStateController dreamOverlayStateController,
		FeatureFlags featureFlags,
		Lazy<ShadeController> shadeController,
		Lazy<NotificationShadeWindowController> notificationShadeWindowController,
		Lazy<ActivityLaunchAnimator> activityLaunchAnimator,
		@@ -144,7 +142,6 @@ public class KeyguardModule {
		screenOnCoordinator,
		interactionJankMonitor,
		dreamOverlayStateController,
		featureFlags,
		shadeController,
		notificationShadeWindowController,
		activityLaunchAnimator,