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

Merge "Fix status bar flickering" into rvc-dev am: e22637f3c4

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

Change-Id: I6a99ad0ebb0432b2853ce26666717972009f52d0
This commit is contained in:
TreeHugger Robot
2020-06-25 21:38:05 +00:00
committed by Automerger Merge Worker
parent 370e7a8bb1 e22637f3c4
commit b501d03aeb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -166,6 +166,7 @@ public class NotificationPanelViewController extends PanelViewController {
private final ConfigurationListener mConfigurationListener = new ConfigurationListener(); private final ConfigurationListener mConfigurationListener = new ConfigurationListener();
private final StatusBarStateListener mStatusBarStateListener = new StatusBarStateListener(); private final StatusBarStateListener mStatusBarStateListener = new StatusBarStateListener();
private final ExpansionCallback mExpansionCallback = new ExpansionCallback(); private final ExpansionCallback mExpansionCallback = new ExpansionCallback();
private final BiometricUnlockController mBiometricUnlockController;
private final NotificationPanelView mView; private final NotificationPanelView mView;
private final MetricsLogger mMetricsLogger; private final MetricsLogger mMetricsLogger;
private final ActivityManager mActivityManager; private final ActivityManager mActivityManager;
@@ -227,7 +228,8 @@ public class NotificationPanelViewController extends PanelViewController {
mBarState == StatusBarState.KEYGUARD mBarState == StatusBarState.KEYGUARD
|| mBarState == StatusBarState.SHADE_LOCKED; || mBarState == StatusBarState.SHADE_LOCKED;
if (!running && mFirstBypassAttempt && keyguardOrShadeLocked && !mDozing if (!running && mFirstBypassAttempt && keyguardOrShadeLocked && !mDozing
&& !mDelayShowingKeyguardStatusBar) { && !mDelayShowingKeyguardStatusBar
&& !mBiometricUnlockController.isBiometricUnlock()) {
mFirstBypassAttempt = false; mFirstBypassAttempt = false;
animateKeyguardStatusBarIn(StackStateAnimator.ANIMATION_DURATION_STANDARD); animateKeyguardStatusBarIn(StackStateAnimator.ANIMATION_DURATION_STANDARD);
} }
@@ -487,6 +489,7 @@ public class NotificationPanelViewController extends PanelViewController {
StatusBarTouchableRegionManager statusBarTouchableRegionManager, StatusBarTouchableRegionManager statusBarTouchableRegionManager,
ConversationNotificationManager conversationNotificationManager, ConversationNotificationManager conversationNotificationManager,
MediaHierarchyManager mediaHierarchyManager, MediaHierarchyManager mediaHierarchyManager,
BiometricUnlockController biometricUnlockController,
StatusBarKeyguardViewManager statusBarKeyguardViewManager) { StatusBarKeyguardViewManager statusBarKeyguardViewManager) {
super(view, falsingManager, dozeLog, keyguardStateController, super(view, falsingManager, dozeLog, keyguardStateController,
(SysuiStatusBarStateController) statusBarStateController, vibratorHelper, (SysuiStatusBarStateController) statusBarStateController, vibratorHelper,
@@ -511,6 +514,7 @@ public class NotificationPanelViewController extends PanelViewController {
mDisplayId = displayId; mDisplayId = displayId;
mPulseExpansionHandler = pulseExpansionHandler; mPulseExpansionHandler = pulseExpansionHandler;
mDozeParameters = dozeParameters; mDozeParameters = dozeParameters;
mBiometricUnlockController = biometricUnlockController;
pulseExpansionHandler.setPulseExpandAbortListener(() -> { pulseExpansionHandler.setPulseExpandAbortListener(() -> {
if (mQs != null) { if (mQs != null) {
mQs.animateHeaderSlidingOut(); mQs.animateHeaderSlidingOut();

4
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java
View File

@@ -180,6 +180,8 @@ public class NotificationPanelViewTest extends SysuiTestCase {
@Mock @Mock
private ConversationNotificationManager mConversationNotificationManager; private ConversationNotificationManager mConversationNotificationManager;
@Mock @Mock
private BiometricUnlockController mBiometricUnlockController;
@Mock
private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
private FlingAnimationUtils.Builder mFlingAnimationUtilsBuilder; private FlingAnimationUtils.Builder mFlingAnimationUtilsBuilder;
@@ -238,7 +240,7 @@ public class NotificationPanelViewTest extends SysuiTestCase {
mMetricsLogger, mActivityManager, mZenModeController, mConfigurationController, mMetricsLogger, mActivityManager, mZenModeController, mConfigurationController,
mFlingAnimationUtilsBuilder, mStatusBarTouchableRegionManager, mFlingAnimationUtilsBuilder, mStatusBarTouchableRegionManager,
mConversationNotificationManager, mMediaHiearchyManager, mConversationNotificationManager, mMediaHiearchyManager,
mStatusBarKeyguardViewManager); mBiometricUnlockController, mStatusBarKeyguardViewManager);
mNotificationPanelViewController.initDependencies(mStatusBar, mGroupManager, mNotificationPanelViewController.initDependencies(mStatusBar, mGroupManager,
mNotificationShelf, mNotificationAreaController, mScrimController); mNotificationShelf, mNotificationAreaController, mScrimController);
mNotificationPanelViewController.setHeadsUpManager(mHeadsUpManager); mNotificationPanelViewController.setHeadsUpManager(mHeadsUpManager);