Merge "Revert "Use new GX overlay for new AOD/lockscreen transitions."" into sc-dev (8443a371) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/flags.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -35,9 +35,6 @@

		<bool name="flag_brightness_slider">false</bool>

		<!-- The new animations to/from lockscreen and AOD! -->
		<bool name="flag_lockscreen_animations">false</bool>

		<!-- People Tile flag -->
		<bool name="flag_conversations">false</bool>

packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -67,10 +67,6 @@ public class FeatureFlags {
		return mFlagReader.isEnabled(R.bool.flag_brightness_slider);
		}

		public boolean useNewLockscreenAnimations() {
		return mFlagReader.isEnabled(R.bool.flag_lockscreen_animations);
		}

		public boolean isPeopleTileEnabled() {
		return mFlagReader.isEnabled(R.bool.flag_conversations);
		}

packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,10 +11,14 @@ import android.graphics.PorterDuffColorFilter
		import android.graphics.PorterDuffXfermode
		import android.graphics.RadialGradient
		import android.graphics.Shader
		import android.os.SystemProperties
		import android.util.AttributeSet
		import android.view.View
		import com.android.systemui.Interpolators

		val enableLightReveal =
		SystemProperties.getBoolean("persist.sysui.show_new_screen_on_transitions", false)

		/**
		* Provides methods to modify the various properties of a [LightRevealScrim] to reveal between 0% to
		* 100% of the view(s) underneath the scrim.

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.doze.AlwaysOnDisplayPolicy;
		import com.android.systemui.doze.DozeScreenState;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.tuner.TunerService;

		@@ -55,7 +54,6 @@ public class DozeParameters implements TunerService.Tunable,
		private final AlwaysOnDisplayPolicy mAlwaysOnPolicy;
		private final Resources mResources;
		private final BatteryController mBatteryController;
		private final FeatureFlags mFeatureFlags;

		private boolean mDozeAlwaysOn;
		private boolean mControlScreenOffAnimation;
		@@ -67,8 +65,7 @@ public class DozeParameters implements TunerService.Tunable,
		AlwaysOnDisplayPolicy alwaysOnDisplayPolicy,
		PowerManager powerManager,
		BatteryController batteryController,
		TunerService tunerService,
		FeatureFlags featureFlags) {
		TunerService tunerService) {
		mResources = resources;
		mAmbientDisplayConfiguration = ambientDisplayConfiguration;
		mAlwaysOnPolicy = alwaysOnDisplayPolicy;
		@@ -77,7 +74,6 @@ public class DozeParameters implements TunerService.Tunable,
		mControlScreenOffAnimation = !getDisplayNeedsBlanking();
		mPowerManager = powerManager;
		mPowerManager.setDozeAfterScreenOff(!mControlScreenOffAnimation);
		mFeatureFlags = featureFlags;

		tunerService.addTunable(
		this,
		@@ -204,7 +200,8 @@ public class DozeParameters implements TunerService.Tunable,
		* then abruptly showing AOD.
		*/
		public boolean shouldControlUnlockedScreenOff() {
		return getAlwaysOn() && mFeatureFlags.useNewLockscreenAnimations();
		return getAlwaysOn() && SystemProperties.getBoolean(
		"persist.sysui.show_new_screen_on_transitions", false);
		}

		private boolean getBoolean(String propName, int resId) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −9

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import static com.android.systemui.charging.WirelessChargingLayout.UNKNOWN_BATTE
		import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_ASLEEP;
		import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE;
		import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING;
		import static com.android.systemui.statusbar.LightRevealScrimKt.getEnableLightReveal;
		import static com.android.systemui.statusbar.NotificationLockscreenUserManager.PERMISSION_SELF;
		import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;
		import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;
		@@ -179,7 +180,6 @@ import com.android.systemui.statusbar.AutoHideUiElement;
		import com.android.systemui.statusbar.BackDropView;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.CrossFadeHelper;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.GestureRecorder;
		import com.android.systemui.statusbar.KeyboardShortcuts;
		import com.android.systemui.statusbar.KeyguardIndicationController;
		@@ -440,7 +440,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		private final KeyguardViewMediator mKeyguardViewMediator;
		protected final NotificationInterruptStateProvider mNotificationInterruptStateProvider;
		private final BrightnessSlider.Factory mBrightnessSliderFactory;
		private final FeatureFlags mFeatureFlags;

		private final List<ExpansionChangedListener> mExpansionChangedListeners;

		@@ -763,8 +762,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy,
		StatusBarTouchableRegionManager statusBarTouchableRegionManager,
		NotificationIconAreaController notificationIconAreaController,
		BrightnessSlider.Factory brightnessSliderFactory,
		FeatureFlags featureFlags) {
		BrightnessSlider.Factory brightnessSliderFactory) {
		super(context);
		mNotificationsController = notificationsController;
		mLightBarController = lightBarController;
		@@ -842,7 +840,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		mDemoModeController = demoModeController;
		mNotificationIconAreaController = notificationIconAreaController;
		mBrightnessSliderFactory = brightnessSliderFactory;
		mFeatureFlags = featureFlags;

		mExpansionChangedListeners = new ArrayList<>();

		@@ -1184,11 +1181,9 @@ public class StatusBar extends SystemUI implements DemoMode,

		mLightRevealScrim = mNotificationShadeWindowView.findViewById(R.id.light_reveal_scrim);

		if (mFeatureFlags.useNewLockscreenAnimations() && mDozeParameters.getAlwaysOn()) {
		if (getEnableLightReveal()) {
		mLightRevealScrim.setVisibility(View.VISIBLE);
		mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);
		} else {
		mLightRevealScrim.setVisibility(View.GONE);
		}

		mNotificationPanelViewController.initDependencies(
		@@ -3619,7 +3614,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		@Override
		public void onDozeAmountChanged(float linear, float eased) {
		if (mFeatureFlags.useNewLockscreenAnimations()) {
		if (getEnableLightReveal()) {
		mLightRevealScrim.setRevealAmount(1f - linear);
		}
		}