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

Merge "Don't hide AOD icons if we're not in KEYGUARD but will be shortly due to the screen off animation." into sc-dev am: b5678c5ac0 am: d206664c95

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

Change-Id: I5bdd0cd8fae44c4e9a59780f55e8ab30988e34dd
This commit is contained in:
Josh Tsuji
2021-06-28 17:40:24 +00:00
committed by Automerger Merge Worker
parent c5c01185b2 d206664c95
commit b577d0858a
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
View File

@@ -71,6 +71,7 @@ public class NotificationIconAreaController implements
private final DozeParameters mDozeParameters;
private final Optional<Bubbles> mBubblesOptional;
private final StatusBarWindowController mStatusBarWindowController;
private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
private int mIconSize;
private int mIconHPadding;
@@ -119,7 +120,8 @@ public class NotificationIconAreaController implements
Optional<Bubbles> bubblesOptional,
DemoModeController demoModeController,
DarkIconDispatcher darkIconDispatcher,
StatusBarWindowController statusBarWindowController) {
StatusBarWindowController statusBarWindowController,
UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {
mContrastColorUtil = ContrastColorUtil.getInstance(context);
mContext = context;
mStatusBarStateController = statusBarStateController;
@@ -133,6 +135,7 @@ public class NotificationIconAreaController implements
mDemoModeController = demoModeController;
mDemoModeController.addCallback(this);
mStatusBarWindowController = statusBarWindowController;
mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;
notificationListener.addNotificationSettingsListener(mSettingsListener);
initializeNotificationAreaViews(context);
@@ -677,7 +680,12 @@ public class NotificationIconAreaController implements
}
boolean visible = mBypassController.getBypassEnabled()
|| mWakeUpCoordinator.getNotificationsFullyHidden();
if (mStatusBarStateController.getState() != StatusBarState.KEYGUARD) {
// Hide the AOD icons if we're not in the KEYGUARD state unless the screen off animation is
// playing, in which case we want them to be visible since we're animating in the AOD UI and
// will be switching to KEYGUARD shortly.
if (mStatusBarStateController.getState() != StatusBarState.KEYGUARD
&& !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {
visible = false;
}
if (visible && mWakeUpCoordinator.isPulseExpanding()) {

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconAreaControllerTest.java
View File

@@ -66,6 +66,8 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase {
DarkIconDispatcher mDarkIconDispatcher;
@Mock
StatusBarWindowController mStatusBarWindowController;
@Mock
UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
private NotificationIconAreaController mController;
@Mock
private Bubbles mBubbles;
@@ -87,7 +89,8 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase {
Optional.of(mBubbles),
mDemoModeController,
mDarkIconDispatcher,
mStatusBarWindowController);
mStatusBarWindowController,
mUnlockedScreenOffAnimationController);
}
@Test