commit fa2510f0c7b49ab4ba6e3a0d6a9d7676f40f24b6
author Milton Wu <mingjuwu@google.com> Mon Mar 07 10:58:26 2022 +0800
committer Milton Wu <mingjuwu@google.com> Thu Mar 10 09:29:13 2022 +0000
tree ad32579c53e5abd7288bcec30fe1ef693b715272
parent 8507e74ef6700a1ea1f8a791798984cdcf9f5428

Refine CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE

Do not begin CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE when isDozing.

Bug: 221405860
Test: atest NotificationPanelViewControllerTest
Change-Id: Ib00f4196c8a9489a275b8d7a4729b8c143ce0986
(cherry picked from commit 7e35b7a1aad635c05edd7f5e10ecaa44ae537cb9)

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
index 1d560c4..942aab5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
@@ -382,7 +382,7 @@
 
     protected void startExpandMotion(float newX, float newY, boolean startTracking,
             float expandedHeight) {
-        if (!mHandlingPointerUp) {
+        if (!mHandlingPointerUp && !mStatusBarStateController.isDozing()) {
             beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);
         }
         mInitialOffsetOnTouch = expandedHeight;
@@ -654,7 +654,9 @@
 
             @Override
             public void onAnimationStart(Animator animation) {
-                beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);
+                if (!mStatusBarStateController.isDozing()) {
+                    beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);
+                }
             }
 
             @Override