From 9fe52e1d71b0b88e1472cf0f65ad668235b4293b Mon Sep 17 00:00:00 2001 From: Vania Januar Date: Tue, 19 Jul 2022 14:42:03 +0100 Subject: [PATCH] Moving PanelViewController and PanelView to android.systemui.shade. As PanelViewController seems very related to NotificationPanelViewController it might be better for them to live in the same package. Imports have been updated and the scoping has been expanded as necessary. This is a follow up from ag/19202451. Bug: 238333941 Test: atest SystemUITests Change-Id: Ief8ad6dc74056ab3292b94c191eea0e5d209996c --- .../android/systemui/camera/CameraGestureHelper.kt | 2 +- .../dreams/touch/dagger/BouncerSwipeModule.java | 2 +- .../android/systemui/shade/NotificationPanelView.java | 1 - .../shade/NotificationPanelViewController.java | 2 -- .../{statusbar/phone => shade}/PanelView.java | 6 +++++- .../phone => shade}/PanelViewController.java | 11 +++++++++-- .../shade/NotificationPanelViewControllerTest.java | 1 - .../phone/PhoneStatusBarViewControllerTest.kt | 1 + .../statusbar/phone/PhoneStatusBarViewTest.kt | 1 + 9 files changed, 18 insertions(+), 9 deletions(-) rename packages/SystemUI/src/com/android/systemui/{statusbar/phone => shade}/PanelView.java (91%) rename packages/SystemUI/src/com/android/systemui/{statusbar/phone => shade}/PanelViewController.java (99%) diff --git a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt index cccd3a482ef03..81da80233d422 100644 --- a/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt @@ -36,7 +36,7 @@ import com.android.systemui.plugins.ActivityStarter 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.statusbar.phone.PanelViewController +import com.android.systemui.shade.PanelViewController import com.android.systemui.statusbar.policy.KeyguardStateController import java.util.concurrent.Executor import javax.inject.Inject 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 b9436f96c74fc..9c22dc61e67b7 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.statusbar.phone.PanelViewController; +import com.android.systemui.shade.PanelViewController; import com.android.wm.shell.animation.FlingAnimationUtils; import javax.inject.Named; diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java index e0997ff0f9054..9818af3751a7c 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelView.java @@ -25,7 +25,6 @@ import android.graphics.PorterDuffXfermode; import android.util.AttributeSet; import com.android.systemui.R; -import com.android.systemui.statusbar.phone.PanelView; import com.android.systemui.statusbar.phone.TapAgainView; public class NotificationPanelView extends PanelView { diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index bab92ba492c9a..1e1ed5815b188 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -193,8 +193,6 @@ import com.android.systemui.statusbar.phone.LargeScreenShadeHeaderController; import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent; import com.android.systemui.statusbar.phone.NotificationIconAreaController; -import com.android.systemui.statusbar.phone.PanelView; -import com.android.systemui.statusbar.phone.PanelViewController; import com.android.systemui.statusbar.phone.PhoneStatusBarView; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; import com.android.systemui.statusbar.phone.ScrimController; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/shade/PanelView.java similarity index 91% rename from packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java rename to packages/SystemUI/src/com/android/systemui/shade/PanelView.java index 45dc943de2f87..1082967d3b5fa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/shade/PanelView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.phone; +package com.android.systemui.shade; import android.content.Context; import android.content.res.Configuration; @@ -22,6 +22,10 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; +import com.android.systemui.statusbar.phone.CentralSurfaces; +import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; +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(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java rename to packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java index 3a85a3ea63910..229acf4ed061b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.phone; +package com.android.systemui.shade; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; @@ -60,7 +60,14 @@ import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.VibratorHelper; import com.android.systemui.statusbar.notification.stack.AmbientState; +import com.android.systemui.statusbar.phone.BounceInterpolator; +import com.android.systemui.statusbar.phone.CentralSurfaces; +import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; +import com.android.systemui.statusbar.phone.KeyguardBottomAreaView; +import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent; +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; +import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.time.SystemClock; @@ -388,7 +395,7 @@ public abstract class PanelViewController { return Math.abs(yDiff) >= Math.abs(xDiff); } - protected void startExpandMotion(float newX, float newY, boolean startTracking, + public void startExpandMotion(float newX, float newY, boolean startTracking, float expandedHeight) { if (!mHandlingPointerUp && !mStatusBarStateController.isDozing()) { beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE); 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 5abcff3c56f63..7ef931e73f0ec 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -146,7 +146,6 @@ import com.android.systemui.statusbar.phone.KeyguardStatusBarViewController; import com.android.systemui.statusbar.phone.LargeScreenShadeHeaderController; import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.NotificationIconAreaController; -import com.android.systemui.statusbar.phone.PanelViewController; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; import com.android.systemui.statusbar.phone.ScrimController; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; 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 ba29e953c73d9..9892448aed030 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,6 +26,7 @@ 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.statusbar.phone.userswitcher.StatusBarUserSwitcherController import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.unfold.SysUIUnfoldComponent 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 8d686ae94e799..d6c995bef2295 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,6 +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.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test