commit 0a1791b958d98cc208f36f4222ad518c28fba58e
author Bryan Eyler <bryaneyler@google.com> Wed Jul 19 16:29:49 2017 -0700
committer Bryan Eyler <bryaneyler@google.com> Thu Jul 27 17:37:26 2017 +0000
tree e3256d02c91d7be4bf5379149e6c8a04b3d80625
parent 37f2e48697592e7d693d8828bcb3238c8223805f

Cancel fullscreen countdown timer on interaction.

Any interaction on the fullscreen user switcher should cancel the
countdown timer and cause it to go away.

Tested on Mojave
Bug 36454400

Change-Id: I22556988d38d140e773cbc7eff03a30bde4f1f46
(cherry picked from commit 87f575098bf6465bd46ef6c99b555ee6c167dee5)

packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
index 9338887..6060134 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java
@@ -74,6 +74,15 @@
             automaticallySelectUser();
         });
 
+        // Any interaction with the screen should cancel the timer.
+        mContainer.setOnClickListener(v -> {
+            cancelTimer();
+        });
+        mUserGridView.setOnTouchListener((v, e) -> {
+            cancelTimer();
+            return false;
+        });
+
         mSwitchingUsers = mParent.findViewById(R.id.switching_users);
     }
 
@@ -152,6 +161,7 @@
         if (mTimer != null) {
             mTimer.cancel();
             mTimer = null;
+            mProgressBar.setProgress(0, true /* animate */);
         }
     }