commit c91767f3655e86c71a3f07e167bddb21c0b7ac36
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 10 13:31:13 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 10 13:31:13 2022 +0000
tree 54e993acf0e8992b4b4f0e8d475bf3008e97cd17
parent 6376279741c0283a443a74ec6c268aa33031a5af
parent fa2510f0c7b49ab4ba6e3a0d6a9d7676f40f24b6

Merge "Refine CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE" into tm-dev

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