diff options
6 files changed, 4 insertions, 14 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 1876f4739c87..cf7c3e019818 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -2045,7 +2045,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mView.animate().cancel(); } - @Override public void expandToQs() { if (mQsController.isExpansionEnabled()) { mQsController.setExpandImmediate(true); @@ -2812,7 +2811,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mQsController.setListening(listening); } - @Override public void expand(boolean animate) { if (isFullyCollapsed() || isCollapsing()) { mInstantExpanding = true; diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt index 1f4a0f1f1b91..7a1637eeab15 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt @@ -31,12 +31,6 @@ import java.util.function.Consumer * @see NotificationPanelViewController */ interface ShadeViewController { - /** Expand the shade either animated or instantly. */ - fun expand(animate: Boolean) - - /** Animates to an expanded shade with QS expanded. If the shade starts expanded, expands QS. */ - fun expandToQs() - /** Returns whether the shade is expanding or collapsing itself or quick settings. */ val isExpandingOrCollapsing: Boolean diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt index d756f026e21d..3be3f6b1441d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt @@ -28,8 +28,6 @@ import javax.inject.Inject /** Empty implementation of ShadeViewController for variants with no shade. */ class ShadeViewControllerEmptyImpl @Inject constructor() : ShadeViewController, ShadeBackActionInteractor, ShadeLockscreenInteractor { - override fun expand(animate: Boolean) {} - override fun expandToQs() {} override fun expandToNotifications() {} override val isExpandingOrCollapsing: Boolean = false override val isExpanded: Boolean = false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java index 3669ba851005..560d5ba32fd6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java @@ -309,7 +309,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba if (mVibrateOnOpening) { vibrateOnNavigationKeyDown(); } - mShadeViewController.expand(true /* animate */); + mShadeController.animateExpandShade(); mNotificationStackScrollLayoutController.setWillExpand(true); mHeadsUpManager.unpinAll(true /* userUnpinned */); mMetricsLogger.count("panel_open", 1); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt index 68a0e9cc1bf8..f29ec8f38c27 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt @@ -91,7 +91,7 @@ private constructor( if (event.source == InputDevice.SOURCE_MOUSE) { if (event.action == MotionEvent.ACTION_UP) { v.performClick() - shadeViewController.expand(/* animate= */ true) + shadeController.animateExpandShade() } return true } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt index eb890c7a78d0..443dd6a5dbc4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt @@ -243,7 +243,7 @@ class PhoneStatusBarViewControllerTest : SysuiTestCase() { statusContainer.dispatchTouchEvent( getActionUpEventFromSource(InputDevice.SOURCE_MOUSE) ) - verify(shadeViewController).expand(any()) + verify(shadeControllerImpl).animateExpandShade() } @Test @@ -272,7 +272,7 @@ class PhoneStatusBarViewControllerTest : SysuiTestCase() { controller = createAndInitController(view) } view.performClick() - verify(shadeViewController, never()).expand(any()) + verify(shadeControllerImpl, never()).animateExpandShade() } private fun getCommandQueueCallback(): CommandQueue.Callbacks { |