diff options
11 files changed, 33 insertions, 89 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index fcaad96811d7..85d15dca12cb 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -693,7 +693,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements final Display display = mView.getDisplay(); mView.setComponents(mRecentsOptional); if (mCentralSurfacesOptionalLazy.get().isPresent()) { - mView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController()); + mView.setComponents( + mCentralSurfacesOptionalLazy.get().get().getNotificationPanelViewController()); } mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer); mView.setOnVerticalChangedListener(this::onVerticalChanged); @@ -1282,8 +1283,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements } private void onVerticalChanged(boolean isVertical) { - mCentralSurfacesOptionalLazy.get().ifPresent( - statusBar -> statusBar.setQsScrimEnabled(!isVertical)); + mCentralSurfacesOptionalLazy.get().ifPresent(statusBar -> + statusBar.getNotificationPanelViewController().setQsScrimEnabled(!isVertical)); } private boolean onNavigationTouch(View v, MotionEvent event) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index ae2c6a856b4f..46c4f410d078 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -192,7 +192,8 @@ public class OverviewProxyService extends CurrentUserTracker implements // TODO move this logic to message queue mCentralSurfacesOptionalLazy.get().ifPresent(centralSurfaces -> { if (event.getActionMasked() == ACTION_DOWN) { - centralSurfaces.getPanelController().startExpandLatencyTracking(); + centralSurfaces.getNotificationPanelViewController() + .startExpandLatencyTracking(); } mHandler.post(() -> { int action = event.getActionMasked(); @@ -616,7 +617,7 @@ public class OverviewProxyService extends CurrentUserTracker implements final NavigationBarView navBarView = mNavBarControllerLazy.get().getNavigationBarView(mContext.getDisplayId()); final NotificationPanelViewController panelController = - mCentralSurfacesOptionalLazy.get().get().getPanelController(); + mCentralSurfacesOptionalLazy.get().get().getNotificationPanelViewController(); if (SysUiState.DEBUG) { Log.d(TAG_OPS, "Updating sysui state flags: navBarFragment=" + navBarFragment + " navBarView=" + navBarView + " panelController=" + panelController); diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 106fc75ac15a..fac2a97e65a3 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -531,7 +531,7 @@ public final class NotificationPanelViewController { private final NavigationBarController mNavigationBarController; private final int mDisplayId; - private KeyguardIndicationController mKeyguardIndicationController; + private final KeyguardIndicationController mKeyguardIndicationController; private int mHeadsUpInset; private boolean mHeadsUpPinnedMode; private boolean mAllowExpandForSmallExpansion; @@ -743,6 +743,7 @@ public final class NotificationPanelViewController { SysUiState sysUiState, Provider<KeyguardBottomAreaViewController> keyguardBottomAreaViewControllerProvider, KeyguardUnlockAnimationController keyguardUnlockAnimationController, + KeyguardIndicationController keyguardIndicationController, NotificationListContainer notificationListContainer, NotificationStackSizeCalculator notificationStackSizeCalculator, UnlockedScreenOffAnimationController unlockedScreenOffAnimationController, @@ -779,6 +780,7 @@ public final class NotificationPanelViewController { mResources = mView.getResources(); mKeyguardStateController = keyguardStateController; + mKeyguardIndicationController = keyguardIndicationController; mStatusBarStateController = (SysuiStatusBarStateController) statusBarStateController; mNotificationShadeWindowController = notificationShadeWindowController; FlingAnimationUtils.Builder fauBuilder = flingAnimationUtilsBuilder.get(); @@ -1020,7 +1022,7 @@ public final class NotificationPanelViewController { mNotificationStackScrollLayoutController.setOnEmptySpaceClickListener( mOnEmptySpaceClickListener); addTrackingHeadsUpListener(mNotificationStackScrollLayoutController::setTrackingHeadsUp); - mKeyguardBottomArea = mView.findViewById(R.id.keyguard_bottom_area); + setKeyguardBottomArea(mView.findViewById(R.id.keyguard_bottom_area)); initBottomArea(); @@ -1264,7 +1266,7 @@ public final class NotificationPanelViewController { int index = mView.indexOfChild(mKeyguardBottomArea); mView.removeView(mKeyguardBottomArea); KeyguardBottomAreaView oldBottomArea = mKeyguardBottomArea; - mKeyguardBottomArea = mKeyguardBottomAreaViewControllerProvider.get().getView(); + setKeyguardBottomArea(mKeyguardBottomAreaViewControllerProvider.get().getView()); mKeyguardBottomArea.initFrom(oldBottomArea); mView.addView(mKeyguardBottomArea, index); initBottomArea(); @@ -1343,8 +1345,8 @@ public final class NotificationPanelViewController { return mHintAnimationRunning || mUnlockedScreenOffAnimationController.isAnimationPlaying(); } - public void setKeyguardIndicationController(KeyguardIndicationController indicationController) { - mKeyguardIndicationController = indicationController; + private void setKeyguardBottomArea(KeyguardBottomAreaView keyguardBottomArea) { + mKeyguardBottomArea = keyguardBottomArea; mKeyguardIndicationController.setIndicationArea(mKeyguardBottomArea); } @@ -3880,6 +3882,7 @@ public final class NotificationPanelViewController { public void setHeadsUpManager(HeadsUpManagerPhone headsUpManager) { mHeadsUpManager = headsUpManager; + mHeadsUpManager.addListener(mOnHeadsUpChangedListener); mHeadsUpTouchHelper = new HeadsUpTouchHelper(headsUpManager, mNotificationStackScrollLayoutController.getHeadsUpCallback(), NotificationPanelViewController.this); @@ -4361,10 +4364,6 @@ public final class NotificationPanelViewController { mView.getViewTreeObserver().removeOnGlobalLayoutListener(listener); } - public ShadeHeadsUpChangedListener getOnHeadsUpChangedListener() { - return mOnHeadsUpChangedListener; - } - public void setHeaderDebugInfo(String text) { if (DEBUG_DRAWABLE) mHeaderDebugInfo = text; } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java index f389dd970fbc..eaf7faecd5b3 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeControllerImpl.java @@ -224,6 +224,6 @@ public class ShadeControllerImpl implements ShadeController { } private NotificationPanelViewController getNotificationPanelViewController() { - return getCentralSurfaces().getPanelController(); + return getCentralSurfaces().getNotificationPanelViewController(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java index 75b444fbd297..dc370821dc95 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java @@ -196,8 +196,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn void collapsePanelOnMainThread(); - void collapsePanelWithDuration(int duration); - void togglePanel(); void start(); @@ -305,9 +303,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn void checkBarModes(); - // Called by NavigationBarFragment - void setQsScrimEnabled(boolean scrimEnabled); - void updateBubblesVisibility(); void setInteracting(int barWindow, boolean interacting); @@ -379,8 +374,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn void showKeyguardImpl(); - boolean isInLaunchTransition(); - void fadeKeyguardAfterLaunchTransition(Runnable beforeFading, Runnable endRunnable, Runnable cancelRunnable); @@ -437,8 +430,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn void showPinningEscapeToast(); - KeyguardBottomAreaView getKeyguardBottomAreaView(); - void setBouncerShowing(boolean bouncerShowing); void setBouncerShowingOverDream(boolean bouncerShowingOverDream); @@ -505,12 +496,8 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn boolean isBouncerShowingOverDream(); - void onBouncerPreHideAnimation(); - boolean isKeyguardSecure(); - NotificationPanelViewController getPanelController(); - NotificationGutsManager getGutsManager(); void updateNotificationPanelTouchState(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 151f8514d17f..9df014cd0223 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -483,7 +483,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private final Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy; private final CentralSurfacesComponent.Factory mCentralSurfacesComponentFactory; private final PluginManager mPluginManager; - private final com.android.systemui.shade.ShadeController mShadeController; + private final ShadeController mShadeController; private final InitController mInitController; private final PluginDependencyProvider mPluginDependencyProvider; @@ -496,9 +496,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private final StatusBarSignalPolicy mStatusBarSignalPolicy; private final StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager; - // expanded notifications - // the sliding/resizing panel within the notification window - protected NotificationPanelViewController mNotificationPanelViewController; + /** Controller for the Shade. */ + @VisibleForTesting + NotificationPanelViewController mNotificationPanelViewController; // settings private QSPanelController mQSPanelController; @@ -1169,7 +1169,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { initializer.initializeStatusBar(mCentralSurfacesComponent); mStatusBarTouchableRegionManager.setup(this, mNotificationShadeWindowView); - mHeadsUpManager.addListener(mNotificationPanelViewController.getOnHeadsUpChangedListener()); mNotificationPanelViewController.setHeadsUpManager(mHeadsUpManager); createNavigationBar(result); @@ -1178,9 +1177,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mLockscreenWallpaper = mLockscreenWallpaperLazy.get(); } - mNotificationPanelViewController.setKeyguardIndicationController( - mKeyguardIndicationController); - mAmbientIndicationContainer = mNotificationShadeWindowView.findViewById( R.id.ambient_indication_container); @@ -2021,8 +2017,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } void makeExpandedInvisible() { - if (SPEW) Log.d(TAG, "makeExpandedInvisible: mExpandedVisible=" + mExpandedVisible - + " mExpandedVisible=" + mExpandedVisible); + if (SPEW) Log.d(TAG, "makeExpandedInvisible: mExpandedVisible=" + mExpandedVisible); if (!mExpandedVisible || mNotificationShadeWindowView == null) { return; @@ -2198,12 +2193,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mNoAnimationOnNextBarModeChange = false; } - // Called by NavigationBarFragment - @Override - public void setQsScrimEnabled(boolean scrimEnabled) { - mNotificationPanelViewController.setQsScrimEnabled(scrimEnabled); - } - /** Temporarily hides Bubbles if the status bar is hidden. */ @Override public void updateBubblesVisibility() { @@ -2579,14 +2568,11 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */, true /* delayed*/); } else { - // Do it after DismissAction has been processed to conserve the needed // ordering. mMainExecutor.execute(mShadeController::runPostCollapseRunnables); } - } else if (CentralSurfacesImpl.this.isInLaunchTransition() - && mNotificationPanelViewController.isLaunchTransitionFinished()) { - + } else if (mNotificationPanelViewController.isLaunchTransitionFinished()) { // We are not dismissing the shade, but the launch transition is already // finished, // so nobody will call readyForKeyguardDone anymore. Post it such that @@ -3008,11 +2994,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mPresenter.updateMediaMetaData(true /* metaDataChanged */, true); } - @Override - public boolean isInLaunchTransition() { - return mNotificationPanelViewController.isLaunchTransitionFinished(); - } - /** * Fades the content of the keyguard away after the launch transition is done. * @@ -3393,12 +3374,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } } - /** Collapse the panel. The collapsing will be animated for the given {@code duration}. */ - @Override - public void collapsePanelWithDuration(int duration) { - mNotificationPanelViewController.collapseWithDuration(duration); - } - /** * Updates the light reveal effect to reflect the reason we're waking or sleeping (for example, * from the power button). @@ -3488,12 +3463,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mNavigationBarController.showPinningEscapeToast(mDisplayId); } - //TODO(b/254875405): this should be removed. - @Override - public KeyguardBottomAreaView getKeyguardBottomAreaView() { - return mNotificationPanelViewController.getKeyguardBottomAreaView(); - } - protected ViewRootImpl getViewRootImpl() { NotificationShadeWindowView nswv = getNotificationShadeWindowView(); if (nswv != null) return nswv.getViewRootImpl(); @@ -4196,23 +4165,11 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { return mBouncerShowingOverDream; } - /** - * When {@link KeyguardBouncer} starts to be dismissed, playing its animation. - */ - @Override - public void onBouncerPreHideAnimation() { - mNotificationPanelViewController.startBouncerPreHideAnimation(); - - } - @Override public boolean isKeyguardSecure() { return mStatusBarKeyguardViewManager.isSecure(); } - @Override - public NotificationPanelViewController getPanelController() { - return mNotificationPanelViewController; - } + // End Extra BaseStatusBarMethods. @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index ba7a363502f1..a00e75642f55 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -476,7 +476,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } else if (mKeyguardStateController.isShowing() && !hideBouncerOverDream) { if (!isWakeAndUnlocking() && !(mBiometricUnlockController.getMode() == MODE_DISMISS_BOUNCER) - && !mCentralSurfaces.isInLaunchTransition() + && !mNotificationPanelViewController.isLaunchTransitionFinished() && !isUnlockCollapsing()) { if (mBouncer != null) { mBouncer.setExpansion(fraction); @@ -845,7 +845,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (isShowing && isOccluding) { SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED, SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__OCCLUDED); - if (mCentralSurfaces.isInLaunchTransition()) { + if (mNotificationPanelViewController.isLaunchTransitionFinished()) { final Runnable endRunnable = new Runnable() { @Override public void run() { @@ -899,7 +899,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } else { mBouncerInteractor.startDisappearAnimation(finishRunnable); } - mCentralSurfaces.onBouncerPreHideAnimation(); + mNotificationPanelViewController.startBouncerPreHideAnimation(); // We update the state (which will show the keyguard) only if an animation will run on // the keyguard. If there is no animation, we wait before updating the state so that we @@ -931,7 +931,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb long uptimeMillis = SystemClock.uptimeMillis(); long delay = Math.max(0, startTime + HIDE_TIMING_CORRECTION_MS - uptimeMillis); - if (mCentralSurfaces.isInLaunchTransition() + if (mNotificationPanelViewController.isLaunchTransitionFinished() || mKeyguardStateController.isFlingingToDismissKeyguard()) { final boolean wasFlingingToDismissKeyguard = mKeyguardStateController.isFlingingToDismissKeyguard(); @@ -1309,7 +1309,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public boolean shouldDisableWindowAnimationsForUnlock() { - return mCentralSurfaces.isInLaunchTransition(); + return mNotificationPanelViewController.isLaunchTransitionFinished(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt index ee948c04df38..b1642d6addb6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt @@ -31,7 +31,7 @@ class StatusBarLaunchAnimatorController( delegate.onLaunchAnimationStart(isExpandingFullyAbove) centralSurfaces.notificationPanelViewController.setIsLaunchAnimationRunning(true) if (!isExpandingFullyAbove) { - centralSurfaces.collapsePanelWithDuration( + centralSurfaces.notificationPanelViewController.collapseWithDuration( ActivityLaunchAnimator.TIMINGS.totalDuration.toInt()) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java index 45b4353d0ec0..c98c1f2bc97e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -486,6 +486,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mSysUiState, () -> mKeyguardBottomAreaViewController, mKeyguardUnlockAnimationController, + mKeyguardIndicationController, mNotificationListContainer, mNotificationStackSizeCalculator, mUnlockedScreenOffAnimationController, @@ -499,8 +500,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { () -> {}, mNotificationShelfController); mNotificationPanelViewController.setHeadsUpManager(mHeadsUpManager); - mNotificationPanelViewController.setKeyguardIndicationController( - mKeyguardIndicationController); ArgumentCaptor<View.OnAttachStateChangeListener> onAttachStateChangeListenerArgumentCaptor = ArgumentCaptor.forClass(View.OnAttachStateChangeListener.class); verify(mView, atLeast(1)).addOnAttachStateChangeListener( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java index 57557821cca6..7ce3a67ce835 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java @@ -500,7 +500,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { mKeyguardVieMediatorCallback); // TODO: we should be able to call mCentralSurfaces.start() and have all the below values - // initialized automatically. + // initialized automatically and make NPVC private. mCentralSurfaces.mNotificationShadeWindowView = mNotificationShadeWindowView; mCentralSurfaces.mNotificationPanelViewController = mNotificationPanelViewController; mCentralSurfaces.mDozeScrimController = mDozeScrimController; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index 0c35659b458a..716666657871 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -307,7 +307,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { @Test public void onPanelExpansionChanged_neverTranslatesBouncerWhenLaunchingApp() { - when(mCentralSurfaces.isInLaunchTransition()).thenReturn(true); + when(mNotificationPanelView.isLaunchTransitionFinished()).thenReturn(true); mStatusBarKeyguardViewManager.onPanelExpansionChanged( expansionEvent( /* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE, @@ -361,7 +361,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { @Test public void setOccluded_isInLaunchTransition_onKeyguardOccludedChangedCalled() { - when(mCentralSurfaces.isInLaunchTransition()).thenReturn(true); + when(mNotificationPanelView.isLaunchTransitionFinished()).thenReturn(true); mStatusBarKeyguardViewManager.show(null); mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animated */); |