From e1f2ea3d06e46458a9ed846dca57d3a40dd47d62 Mon Sep 17 00:00:00 2001 From: Justin Weir Date: Wed, 17 Aug 2022 13:26:02 -0400 Subject: [PATCH] Remove references to PanelViewController Replaced by references to NPVC Bug: 242211739 Test: atest SystemUITests SystemUIGoogleTests Change-Id: I87828825a7e1c8d189f8f940c2599e3d021e6c9a --- .../android/systemui/camera/CameraGestureHelper.kt | 4 ++-- .../dreams/touch/dagger/BouncerSwipeModule.java | 11 ++++++----- .../src/com/android/systemui/shade/PanelView.java | 4 ++-- .../android/systemui/shade/PanelViewController.java | 2 +- .../shade/NotificationPanelViewControllerTest.java | 8 ++++---- .../phone/PhoneStatusBarViewControllerTest.kt | 12 ++++++------ .../statusbar/phone/PhoneStatusBarViewTest.kt | 6 +++--- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt index 81da80233d422..4fe2dd810a08e 100644 --- a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt @@ -33,10 +33,10 @@ import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.ActivityIntentHelper import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.shade.NotificationPanelViewController import com.android.systemui.shared.system.ActivityManagerKt.isInForeground import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.phone.CentralSurfaces -import com.android.systemui.shade.PanelViewController import com.android.systemui.statusbar.policy.KeyguardStateController import java.util.concurrent.Executor import javax.inject.Inject @@ -117,7 +117,7 @@ class CameraGestureHelper @Inject constructor( ) } catch (e: RemoteException) { Log.w( - PanelViewController.TAG, + NotificationPanelViewController.TAG, "Unable to start camera activity", e ) diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java index 9c22dc61e67b7..081bab085843b 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java @@ -25,7 +25,7 @@ import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.touch.BouncerSwipeTouchHandler; import com.android.systemui.dreams.touch.DreamTouchHandler; -import com.android.systemui.shade.PanelViewController; +import com.android.systemui.shade.NotificationPanelViewController; import com.android.wm.shell.animation.FlingAnimationUtils; import javax.inject.Named; @@ -77,8 +77,9 @@ public class BouncerSwipeModule { Provider flingAnimationUtilsBuilderProvider) { return flingAnimationUtilsBuilderProvider.get() .reset() - .setMaxLengthSeconds(PanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS) - .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR) + .setMaxLengthSeconds( + NotificationPanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS) + .setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR) .build(); } @@ -91,8 +92,8 @@ public class BouncerSwipeModule { Provider flingAnimationUtilsBuilderProvider) { return flingAnimationUtilsBuilderProvider.get() .reset() - .setMaxLengthSeconds(PanelViewController.FLING_MAX_LENGTH_SECONDS) - .setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR) + .setMaxLengthSeconds(NotificationPanelViewController.FLING_MAX_LENGTH_SECONDS) + .setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR) .build(); } diff --git a/packages/SystemUI/src/com/android/systemui/shade/PanelView.java b/packages/SystemUI/src/com/android/systemui/shade/PanelView.java index efff0db742d7b..4349d816b3c37 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/shade/PanelView.java @@ -29,7 +29,7 @@ import com.android.systemui.statusbar.phone.KeyguardBottomAreaView; public abstract class PanelView extends FrameLayout { public static final boolean DEBUG = false; public static final String TAG = PanelView.class.getSimpleName(); - private PanelViewController.TouchHandler mTouchHandler; + private NotificationPanelViewController.TouchHandler mTouchHandler; protected CentralSurfaces mCentralSurfaces; protected HeadsUpManagerPhone mHeadsUpManager; @@ -49,7 +49,7 @@ public abstract class PanelView extends FrameLayout { super(context, attrs, defStyleAttr); } - public void setOnTouchListener(PanelViewController.TouchHandler touchHandler) { + public void setOnTouchListener(NotificationPanelViewController.TouchHandler touchHandler) { super.setOnTouchListener(touchHandler); mTouchHandler = touchHandler; } diff --git a/packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java index 5e7ca2f3dcb2c..93da051f52bfd 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java @@ -75,7 +75,7 @@ import com.android.wm.shell.animation.FlingAnimationUtils; import java.io.PrintWriter; import java.util.List; -public abstract class PanelViewController { +abstract class PanelViewController { public static final String TAG = PanelView.class.getSimpleName(); public static final float FLING_MAX_LENGTH_SECONDS = 0.6f; public static final float FLING_SPEED_UP_FACTOR = 0.6f; 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 7d28871e340cf..98389c2c7a6f6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -259,7 +259,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { private DisplayMetrics mDisplayMetrics = new DisplayMetrics(); @Mock private KeyguardClockSwitch mKeyguardClockSwitch; - private PanelViewController.TouchHandler mTouchHandler; + private NotificationPanelViewController.TouchHandler mTouchHandler; private ConfigurationController mConfigurationController; @Mock private MediaHierarchyManager mMediaHiearchyManager; @@ -454,7 +454,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { doAnswer((Answer) invocation -> { mTouchHandler = invocation.getArgument(0); return null; - }).when(mView).setOnTouchListener(any(PanelViewController.TouchHandler.class)); + }).when(mView).setOnTouchListener(any(NotificationPanelViewController.TouchHandler.class)); NotificationWakeUpCoordinator coordinator = new NotificationWakeUpCoordinator( @@ -1407,7 +1407,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { when(mQsFrame.getWidth()).thenReturn(1000); when(mQsHeader.getTop()).thenReturn(0); when(mQsHeader.getBottom()).thenReturn(1000); - PanelViewController.TouchHandler touchHandler = + NotificationPanelViewController.TouchHandler touchHandler = mNotificationPanelViewController.createTouchHandler(); mNotificationPanelViewController.setExpandedFraction(1f); @@ -1427,7 +1427,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { when(mQsFrame.getWidth()).thenReturn(1000); when(mQsHeader.getTop()).thenReturn(0); when(mQsHeader.getBottom()).thenReturn(1000); - PanelViewController.TouchHandler touchHandler = + NotificationPanelViewController.TouchHandler touchHandler = mNotificationPanelViewController.createTouchHandler(); mNotificationPanelViewController.setExpandedFraction(1f); 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 9892448aed030..a61fba5c40000 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 @@ -26,22 +26,22 @@ import androidx.test.filters.SmallTest import androidx.test.platform.app.InstrumentationRegistry import com.android.systemui.R import com.android.systemui.SysuiTestCase -import com.android.systemui.shade.PanelViewController +import com.android.systemui.shade.NotificationPanelViewController import com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherController import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.unfold.SysUIUnfoldComponent import com.android.systemui.unfold.config.UnfoldTransitionConfig import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider -import com.android.systemui.util.view.ViewUtil import com.android.systemui.util.mockito.any +import com.android.systemui.util.view.ViewUtil import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.mockito.ArgumentCaptor import org.mockito.Mock -import org.mockito.Mockito.spy -import org.mockito.Mockito.mock import org.mockito.Mockito.`when` +import org.mockito.Mockito.mock +import org.mockito.Mockito.spy import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations import java.util.Optional @@ -52,7 +52,7 @@ class PhoneStatusBarViewControllerTest : SysuiTestCase() { private val touchEventHandler = TestTouchEventHandler() @Mock - private lateinit var panelViewController: PanelViewController + private lateinit var notificationPanelViewController: NotificationPanelViewController @Mock private lateinit var panelView: ViewGroup @Mock @@ -76,7 +76,7 @@ class PhoneStatusBarViewControllerTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) - `when`(panelViewController.view).thenReturn(panelView) + `when`(notificationPanelViewController.view).thenReturn(panelView) `when`(sysuiUnfoldComponent.getStatusBarMoveFromCenterAnimationController()) .thenReturn(moveFromCenterAnimation) // create the view on main thread as it requires main looper diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt index d6c995bef2295..5aa7f92d22e87 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt @@ -20,7 +20,7 @@ import android.view.MotionEvent import android.view.ViewGroup import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.shade.PanelViewController +import com.android.systemui.shade.NotificationPanelViewController import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test @@ -32,7 +32,7 @@ import org.mockito.MockitoAnnotations class PhoneStatusBarViewTest : SysuiTestCase() { @Mock - private lateinit var panelViewController: PanelViewController + private lateinit var notificationPanelViewController: NotificationPanelViewController @Mock private lateinit var panelView: ViewGroup @@ -43,7 +43,7 @@ class PhoneStatusBarViewTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) // TODO(b/197137564): Setting up a panel view and its controller feels unnecessary when // testing just [PhoneStatusBarView]. - `when`(panelViewController.view).thenReturn(panelView) + `when`(notificationPanelViewController.view).thenReturn(panelView) view = PhoneStatusBarView(mContext, null) }