Merge "Always use light reveal scrim" into sc-qpr1-dev (d31ee841) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/super_notification_shade.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -62,8 +62,7 @@
		<com.android.systemui.statusbar.LightRevealScrim
		android:id="@+id/light_reveal_scrim"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone" />
		android:layout_height="match_parent" />

		<include layout="@layout/status_bar_expanded"
		android:layout_width="match_parent"

+1 −7

Original line number	Diff line number	Diff line
		@@ -1044,7 +1044,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		mNotificationShadeWindowViewController,
		mNotificationPanelViewController,
		mAmbientIndicationContainer);
		mDozeParameters.addCallback(this::updateLightRevealScrimVisibility);
		updateLightRevealScrimVisibility();

		mConfigurationController.addCallback(this);

		@@ -4956,11 +4956,5 @@ public class StatusBar extends SystemUI implements DemoMode,
		}

		mLightRevealScrim.setAlpha(mScrimController.getState().getMaxLightRevealScrimAlpha());
		if (mFeatureFlags.useNewLockscreenAnimations()
		&& (mDozeParameters.getAlwaysOn() \|\| mDozeParameters.isQuickPickupEnabled())) {
		mLightRevealScrim.setVisibility(View.VISIBLE);
		} else {
		mLightRevealScrim.setVisibility(View.GONE);
		}
		}
		}