Merge "Send user-activity to power manager on lock icon long press" into udc-dev

2023-03-30 20:02:15 +00:00
parent 9097728be5 c9350f8310
commit cdf408830a
1 changed files with 9 additions and 5 deletions
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
@@ -283,11 +283,15 @@ public class NotificationShadeWindowViewController {
                }
                mLockIconViewController.onTouchEvent(
                        ev,
-                        () -> mService.wakeUpIfDozing(
-                                mClock.uptimeMillis(),
-                                mView,
-                                "LOCK_ICON_TOUCH",
-                                PowerManager.WAKE_REASON_GESTURE)
+                        /* onGestureDetectedRunnable */
+                        () -> {
+                            mService.userActivity();
+                            mService.wakeUpIfDozing(
+                                    mClock.uptimeMillis(),
+                                    mView,
+                                    "LOCK_ICON_TOUCH",
+                                    PowerManager.WAKE_REASON_GESTURE);
+                        }
                );

                // In case we start outside of the view bounds (below the status bar), we need to