Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always use light reveal scrim" into sc-qpr1-dev am: d31ee841c0

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

Change-Id: Ic7a84b0c41a081b78d2dd6712dcb422c94450360
This commit is contained in:
TreeHugger Robot
2021-08-24 17:35:06 +00:00
committed by Automerger Merge Worker
parent 6273bfdb1e d31ee841c0
commit 0a49cc54ba
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/super_notification_shade.xml
View File

@@ -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"

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

@@ -1028,7 +1028,7 @@ public class StatusBar extends SystemUI implements
mNotificationShadeWindowViewController,
mNotificationPanelViewController,
mAmbientIndicationContainer);
mDozeParameters.addCallback(this::updateLightRevealScrimVisibility);
updateLightRevealScrimVisibility();
mConfigurationController.addCallback(mConfigurationListener);
@@ -4174,12 +4174,6 @@ public class StatusBar extends SystemUI implements
}
mLightRevealScrim.setAlpha(mScrimController.getState().getMaxLightRevealScrimAlpha());
if (mFeatureFlags.useNewLockscreenAnimations()
&& (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {
mLightRevealScrim.setVisibility(View.VISIBLE);
} else {
mLightRevealScrim.setVisibility(View.GONE);
}
}
private final KeyguardUpdateMonitorCallback mUpdateCallback =