From fa2510f0c7b49ab4ba6e3a0d6a9d7676f40f24b6 Mon Sep 17 00:00:00 2001
From: Milton Wu <mingjuwu@google.com>
Date: Mon, 7 Mar 2022 10:58:26 +0800
Subject: [PATCH] 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)
---
 .../systemui/statusbar/phone/PanelViewController.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 1d560c4592a62..942aab58763e3 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 @@ public abstract class PanelViewController {
 
     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 @@ public abstract class PanelViewController {
 
             @Override
             public void onAnimationStart(Animator animation) {
-                beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);
+                if (!mStatusBarStateController.isDozing()) {
+                    beginJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);
+                }
             }
 
             @Override