commit 12c586c5be1462f82829ecf9c8d2c28cbeda1e5c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 27 20:51:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 27 20:51:06 2017 +0000
tree 6e3bcdcb6a33aaaa91eb87dc1accc9409d1a0feb
parent 2a896e9074290d36372bd9d341ffb6e427305791
parent 0a1791b958d98cc208f36f4222ad518c28fba58e

Merge "Cancel fullscreen countdown timer on interaction." into oc-mr1-dev

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 */);
         }
     }