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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-24 17:23:38 +00:00
committed by Android (Google) Code Review
parent 287273767f d9da035596
commit d31ee841c0
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 <com.android.systemui.statusbar.LightRevealScrim
android:id="@+id/light_reveal_scrim" android:id="@+id/light_reveal_scrim"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:visibility="gone" />
<include layout="@layout/status_bar_expanded" <include layout="@layout/status_bar_expanded"
android:layout_width="match_parent" android:layout_width="match_parent"

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

@@ -1044,7 +1044,7 @@ public class StatusBar extends SystemUI implements DemoMode,
mNotificationShadeWindowViewController, mNotificationShadeWindowViewController,
mNotificationPanelViewController, mNotificationPanelViewController,
mAmbientIndicationContainer); mAmbientIndicationContainer);
mDozeParameters.addCallback(this::updateLightRevealScrimVisibility); updateLightRevealScrimVisibility();
mConfigurationController.addCallback(this); mConfigurationController.addCallback(this);
@@ -4956,11 +4956,5 @@ public class StatusBar extends SystemUI implements DemoMode,
} }
mLightRevealScrim.setAlpha(mScrimController.getState().getMaxLightRevealScrimAlpha()); mLightRevealScrim.setAlpha(mScrimController.getState().getMaxLightRevealScrimAlpha());
if (mFeatureFlags.useNewLockscreenAnimations()
&& (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {
mLightRevealScrim.setVisibility(View.VISIBLE);
} else {
mLightRevealScrim.setVisibility(View.GONE);
}
} }
} }